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

Change-Id: I1a234ee41fc85cbe954990d13b5de123efe9afc8