Merge "Merge "DO NOT MERGE Check caller for sending media key to telephony...

Merge "Merge "DO NOT MERGE Check caller for sending media key to telephony service" into klp-dev am: 5b052265 am: b38fbf98 am: 84ecab60  -s ours am: 5ac79fa0  -s ours am: 890f53a4 am: 1bf809c4 am: 6ad7c0f6  -s ours am: 1c278e56 am: bed76362 am: dd883c7e am: 83217912  -s ours am: c547eeda" into nyc-dev-plus-aosp am: 3434f0f5
am: c1f00b91  -s ours

Change-Id: I1e47962a654c3b43b312dda7e7df8ac13472b9e0