Merge "Make ThemePicker override any other AOSP picker" into main am: 09461d20e3 am: 98be76a984 am: cca5353b72

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

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