Merge "[automerger skipped] Merge "Remove usage of hidden API PhoneConstants.SUBSCRIPTION_KEY" am: 52b8e3e448 am: 45e13fcca4 am: e2dc83dd18 -s ours am skip reason: change_id I437ebf67bd27e2ac69b2b7784d98d7683350652c with SHA1 b752a47537 is in history"