[automerger skipped] Merge ab/7061308 into stage. am: d3063e9ef3 -s ours am: 78c4286afe -s ours

am skip reason: Change-Id I8bc2fc55fe3ac438b571d66d7323e3fc74dc678b with SHA-1 5497138a9f is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie09dec651125c0226358755c9d19a3911511ad68