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

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

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