am 56206042: am bdc6cde7: Merge "Fix PhoneStateListener constructor javadoc."

* commit '5620604261a24419bb87a4540f1a4ff333d32a3f':
  Fix PhoneStateListener constructor javadoc.

diff --cc telephony/java/android/telephony/PhoneStateListener.java
index 8f4a92b,e2189f5..fce4ae7
--- 1/telephony/java/android/telephony/PhoneStateListener.java
--- 2/telephony/java/android/telephony/PhoneStateListener.java
+++ b/telephony/java/android/telephony/PhoneStateListener.java
@@@ -233,11 -231,10 +233,10 @@@ public class PhoneStateListener 
  
      /**
       * Create a PhoneStateListener for the Phone with the default subscription.
-      * This class requires Looper.myLooper() not return null. To supply your
-      * own non-null looper use PhoneStateListener(Looper looper) below.
+      * This class requires Looper.myLooper() not return null.
       */
      public PhoneStateListener() {
 -        this(SubscriptionManager.DEFAULT_SUB_ID, Looper.myLooper());
 +        this(SubscriptionManager.DEFAULT_SUBSCRIPTION_ID, Looper.myLooper());
      }
  
      /**