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
Change-Id: If7538c332a205340a4cb0cc118b1097920ceb855