Merge "Remove hidden API usage PhoneConstants.SUBSCRIPTION_KEY/SLOT_KEY" am: b9d73629 am: 619a963c Change-Id: Ie8f8b58cf152b37600a585d9b0ecf9856c92427c