Merge "Color Picker reset support (1/3)" into tm-qpr-dev am: d5260e6f

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



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