Merge mainline-release 6664920 to master - DO NOT MERGE am: dd2c1d1159

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

Change-Id: I5e43e43b95505e36c0fa5d7cea40a6471dd41437