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

Change-Id: I137e238b1b4a722d5a8931e015bf4239eb48691a