Merge "Color Picker reset support (1/3)" into tm-qpr-dev am: d5260e6f2d am: 37c7ef5547 am: 588f77e0d7

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

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