Merge "Fix lingering theme color reset on reboot issue" into tm-qpr-dev am: f5283b48

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



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