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

Change-Id: I68194558a0266cabedf81cdf43b73dba69d02779