tree ed90b855c63b6d06cd8428ee577cd74afba30aa8
parent 9e1599f8e130d2941add7d5c52c4c8a65e186a76
parent f83c2af57330103506021a80bd9ad0773a2f5627
author Bill Yi <byi@google.com> 1600122017 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1600122017 +0000

[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE am: d1873e50e3 -s ours am: 54291d42de -s ours am: f83c2af573 -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: I82494d78d1eac2e640d6b26861fcb9ece6e2fdf0