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

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

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