Merge "Add javadoc and deprecate addOnSubscriptionsChangedListener(android.telephony.SubscriptionManager.OnSubscriptionsChangedListener)" am: 35c5908f80 am: 0b0e2a7aad am: 81becd1a42

Change-Id: Ica52243002be1dc1e9801e80663bed637300278a