[automerger skipped] Merge "Add TYPE_STATUS_BAR_ADDITIONAL to trusted overlay"...

[automerger skipped] Merge "Add TYPE_STATUS_BAR_ADDITIONAL to trusted overlay" into sc-qpr1-dev am: 519749f6 am: 08696762 -s ours am: 5e63fd8c -s ours

am skip reason: Merged-In I3f41f3eeeed431309d348cc4d1286e4b346f1259 with SHA-1 da3f6a15 is already in history

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

Change-Id: Ic7242e1b9185f2f3a787bb96ce359d203d136e4c