[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE am: d1873e50e3 -s ours

am skip reason: Change-Id I374549da83a882c826b204ff0a1d9a8df6c7e271 with SHA-1 98736716c1 is in history

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

Change-Id: Ic0fe991218e0844d39f5353a8d72c7c514936cb2