[automerger skipped] Merge ab/6749736 in stage. am: 5f16b400 -s ours am:...

[automerger skipped] Merge ab/6749736 in stage. am: 5f16b400 -s ours am: 29797add -s ours am: e112cf5b -s ours

am skip reason: Change-Id I1a854f0d6be46cfd11ada58fa54589147e0f37d7 with SHA-1 5b5354d4 is in history

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

Change-Id: If3c17945f4b65daeb7f1a105e6a9de4552f1ef6f