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

Change-Id: I36334eeb66da30545e2c6d9739e828475b62b872