Merge "Runtime: fix the theme colors on device reset" into udc-qpr-dev am:...

Merge "Runtime: fix the theme colors on device reset" into udc-qpr-dev am: 4da7827a am: 08575aff

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



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