Merge "PendingIntent in MediaOutputIndicatorSlice could be Hijacked" into...
Merge "PendingIntent in MediaOutputIndicatorSlice could be Hijacked" into rvc-dev am: ecea1339 am: 15ac2b2c am: 5201d1d1
Change-Id: I2b6050d242c08219415faca271eb51385824ea88