[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: b152d932 am: 09a58016 -s ours

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

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

Change-Id: I54c54db93d99f6c7fec047e42d425a22c91d5f18