Merge "DO NOT MERGE Check caller for sending media key to telephony service" into klp-dev am: 5b05226586
am: b38fbf9894

Change-Id: I6f6d600544f09aac349a626e3ced18de5e02a2eb