[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: a3c90b5b -s ours am: c5c23225 -s ours

am skip reason: subject contains skip directive

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



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