Merge "Fixed status bar glitch for apps that access internal res" into tm-dev...

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

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



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