[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-plus-aosp am: 5e215160 -s ours am: e3c41047 -s ours am: 9541eb23 -s ours

am skip reason: subject contains skip directive

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



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