Merge "DO NOT MERGE Check caller for sending media key to telephony service" into klp-dev am: 5b05226586 am: b38fbf9894 am: 84ecab6059  -s ours am: 5ac79fa0a1  -s ours am: 890f53a486 am: 1bf809c490
am: 6ad7c0f6ce  -s ours

Change-Id: I71157581308c3ef4be7dad8db5c7d9a637a24320