Merge "Revert^2 "Color Picker reset support (1/3)"" into tm-qpr-dev am: 75ee8e89 am: 7239a42a

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



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