Merge "Revert^2 "Color Picker reset support (1/3)"" into tm-qpr-dev am: 75ee8e89cd am: 7239a42a1f am: 3db0b70ff3 am: b8f210462d

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

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