Merge "Remove telephony API usage: PhoneConstants.SUBSCRIPTION_KEY" am: ddf215dd58
am: cb0d068f28

Change-Id: If502b6af63c532f5c87b384096680f7435018874