Merge "Replace TYPE_STATUS_BAR_PANEL with TYPE_STATUS_BAR_ADDITIONAL" into rvc-dev am: d1bbc147 am: c99bffbf am: 64523281 Change-Id: Ia117d3204b9446d142891ff06c7f452a81a23f5e