[automerger skipped] Merge "[DO NOT MERGE] Fixed status bar glitch for apps...

[automerger skipped] Merge "[DO NOT MERGE] Fixed status bar glitch for apps that access internal res" into sc-v2-dev am: 88af43ac -s ours

am skip reason: Merged-In I306efa187ffa69223c06fd248cfe57d183f96c59 with SHA-1 df830072 is already in history

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



Change-Id: I2af7da6434e6536b393cc109cd2e43559c27da46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>