Merge changes from topic "presubmit-am-f3bba9fc11ff4eba842a3140642ddac9" into sc-qpr1-dev am: 7b6128f204

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

Change-Id: If921b8d98802e8090c2cd43eb55706a0386481b0