Merge "Remove hidden API usage PhoneConstants.SUBSCRIPTION_KEY/SLOT_KEY"
am: b9d73629d1

Change-Id: I70652eb74b6f5638a2ee75c612bc351d9b419c38