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