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 am: 1c278e5652 am: bed7636243 am: dd883c7e87 am: 832179120f  -s ours am: c547eeda12
am: c9ceffd16c

Change-Id: I3456be6ed05ec85e45fbb90f33288b0e0fa02a5e