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