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