[automerger skipped] Merge ab/7061308 into stage. am: d3063e9ef3 -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: Icec09ce7d4b7dd06d5cf8da8775b8e54d294870a