Merge "Add TYPE_STATUS_BAR_ADDITIONAL to trusted overlay" into sc-qpr1-dev am: 519749f60c am: b152d932d4

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15659645

Change-Id: I81651edfc3f47edb52acbd8927cb0c724bba8465