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

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



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