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

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

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