Merge "Merge "Revert "Add media icon to status bar"" into rvc-dev am:...
Merge "Merge "Revert "Add media icon to status bar"" into rvc-dev am: c1b6a084 am: 3c2e880d" into rvc-d1-dev-plus-aosp am: ed58b5ac am: 8fc1bbb4
Change-Id: I45cbc8fa6650b47e8d0e8972f9f2b97dfa6d5ca7