Merge "Replace TYPE_STATUS_BAR_PANEL with TYPE_STATUS_BAR_ADDITIONAL" into rvc-dev am: d1bbc14732 am: c99bffbf8f am: 64523281f3 am: 0f1344ae59

Change-Id: Ie5321f0adc05da2a0914eb117ce28efdb46c18d6