Merge "Revert "Color Picker reset support (1/3)"" into tm-qpr-dev am: 7e3dd8e0 am: d8e84929

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



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