Merge "Color Picker Optimistic Update" into tm-qpr-dev am: 5189d47f am: 582c6bee

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



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