Merge "PendingIntent in MediaOutputIndicatorSlice could be Hijacked" into...
Merge "PendingIntent in MediaOutputIndicatorSlice could be Hijacked" into rvc-dev am: ecea1339 am: 15ac2b2c am: 0f89b27f
Change-Id: Ib0034e3e91473577ed479b200506a348ee39d17b