Merge "Fix missing color option on activity resume (1/2)" into udc-dev am:...

Merge "Fix missing color option on activity resume (1/2)" into udc-dev am: 79ffe8d5 am: d672b677

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/ThemePicker/+/23620629



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