Merge "DO NOT MERGE Check caller for sending media key to global priority...
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into lmp-dev am: 64b7b152 -s ours
am: 5abd69e5
Change-Id: I00d1e9f1c7f41f0f15429a159833c8cbaf789342