[automerger skipped] DO NOT MERGE - Merge Android R QPR1 am: 8ab28679ac -s ours

am skip reason: Change-Id Iacf6381bbe4781a8ce215647e7df401941424bda with SHA-1 d3fd31c6bb is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/WallpaperPicker2/+/1521263

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I87ea58fcdfd7f8c1b6cdde7a9dd819eed9909176