Merge "Do not load drawable for wallet card if the card image icon iscreated with content URI." into sc-dev am: eda58607c8 am: cb2ad18704 am: 53f1f4613d am: c3ef945b91 am: bc6f937d9f

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

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