Merge "DO NOT MERGE Check caller for sending media key to telephony service...

Merge "DO NOT MERGE Check caller for sending media key to telephony service am: d1641e8c am: 9477c167 am: 27d24e01  -s ours am: 8dffbcd1  -s ours am: f140f796 am: 7eaeeb49 am: 7ffaaca2  -s ours am: fa9983ec am: 900d1c90 am: 0e31d938 am: 4da22f27  -s ours am: 36068a2f" into nyc-dev-plus-aosp
am: 9e2319e7

Change-Id: I64e8b58550b1f6121da9e3b5dd21545957f720dc