[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 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: If7d631af15e0ca0e70155091c85e6ff9174c9dd1