Merge "Do not load drawable for wallet card if the card image icon iscreated with content URI." into sc-dev am: eda58607

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



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