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: I0e96f78c6a3e026fdb457f7e0b38691d69df7e1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>