[automerger skipped] Merge ab/6749736 in stage. am: 5f16b400ad -s ours am: 29797adda2 -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: I2067bb92ed9c26ece92bdc9dbc43aa8a4bf2d562