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

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

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

Change-Id: I6b23356156d2ab86ecf733c8356df817ace1fc51