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

Change-Id: Iafa9facfbb0759916cd414b23da19f9a3c367a55