[automerger skipped] Merge "Add quickAffordances Flag" into udc-qpr-dev am: 510f829dbb am: a04eb33487 -s ours

am skip reason: Merged-In I17b83322a0ce66b927928dce1cb61efafe6a3faa with SHA-1 1ab109b930 is already in history

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

Change-Id: I99bf6686ed89058146269376cd3bda9fae9cb8e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>