Merge "Merge "Replace TYPE_STATUS_BAR_PANEL with TYPE_STATUS_BAR_ADDITIONAL"...

Merge "Merge "Replace TYPE_STATUS_BAR_PANEL with TYPE_STATUS_BAR_ADDITIONAL" into rvc-dev am: d1bbc147 am: d4896aaf" into rvc-d1-dev-plus-aosp am: fa5d98ed am: 52ad237d

Change-Id: Ib1109d5b6ba344d2454259f5b77e357aa45131d9