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

Change-Id: Iec10c9a1967976dd2e606297a6505c479aeaeca3