Merge "PendingIntent in MediaOutputIndicatorSlice could be Hijacked" into...
Merge "PendingIntent in MediaOutputIndicatorSlice could be Hijacked" into rvc-dev am: ecea1339 am: 58baac0c am: 75b2e03a
Change-Id: Id2551f8b525ea0cbc6c8b6101f825f432eb1e042