Merge "Fixed status bar glitch for apps that access internal res" into tm-dev am: 455e78d8

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



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