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