Merge "Merge "Revert "Add media icon to status bar"" into rvc-dev am: c1b6a084a0 am: 3c2e880d53" into rvc-d1-dev-plus-aosp am: ed58b5aca2
Change-Id: If7538c332a205340a4cb0cc118b1097920ceb855
This commit is contained in: