Merge "DO NOT MERGE Check caller for sending media key to global priority session am: 4e9af38e  -s ours am: 031fb047 am: 2d88f87a am: 64110c6b  -s ours am: 8d14f464 am: f595add2 am: e1e6f0a7 am: 9632afe8  -s ours am: b96d4105 am: 9b790e27 am: 8d45b452 am: a7dd9932" into nyc-mr1-dev-plus-aosp
am: 4015995d  -s ours

Change-Id: I1faaab4727a8bf954810113e634a77ab3321a033