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

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



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