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

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



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