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

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

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



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