[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: b90702233f -s ours

am skip reason: Merged-In Ic2f6aa1d640b0e6d703d5fb271ba45573be14016 with SHA-1 63028047d8 is already in history

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

Change-Id: I8853f4731022fc8fd9ca83af11c52a6913fb98cd