Merge "DO NOT MERGE Check caller for sending media key to global priority session" into nyc-dev
am: 8ba2549592

Change-Id: I5593d4149bbd8235d42a0cb2b23c9fb091aa70f9