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: f83b9f42

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



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