Merge "Remove usage of hidden API PhoneConstants.SUBSCRIPTION_KEY"
am: 52b8e3e448

Change-Id: I55b96c74990b3b649ab052372a87892c2cf9e5d9