Merge tag 'android-12.1.0_r1' of https://android.googlesource.com/platform//packages/apps/ThemePicker into HEAD

Android 12.1.0 release 1

Change-Id: I91a1b3d9241082f004b078e6b6c9bdc2572a009e

# gpg verification failed.