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

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



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