Merge "Replace TYPE_STATUS_BAR_PANEL with TYPE_STATUS_BAR_ADDITIONAL" into rvc-dev am: d1bbc147 am: d4896aaf Change-Id: I87efa8486cc8dfb877e50f2abfd2aded7fefc564