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

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



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