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

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



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