Merge "Remove hidden API usage PhoneConstants.SUBSCRIPTION_KEY/SLOT_KEY" am: b9d73629d1 am: 619a963c33 am: 5470dde3eb

Change-Id: I5648fd8103f8a73537750ddf4d24b0fae4ae0d9b