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

Change-Id: I7f85d8785ce8829cb9d01a23413c545f5e5a769a