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