Merge "Fixes bug where loyalty card is showing on quick access wallet screen....

Merge "Fixes bug where loyalty card is showing on quick access wallet screen. Before/after screenshots of change: http://shortn/_BYxp8yQ9uo" into udc-qpr-dev am: e82396f1

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24620489



Change-Id: Ide67f003122f53ca347744211c50071774d01b5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>