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

Change-Id: I0a316929c7654f89e435ac459bc9175434136f99