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

Change-Id: I0b0b672c42a7a4bd75ccbeb2c3a1047eebda5076