Merge branch 'dev/11/fp3/security-aosp-rvc-release' into int/11/fp3

* dev/11/fp3/security-aosp-rvc-release:
  Do not load drawable for wallet card if the card image icon is created with content URI.

Change-Id: I278c010139af791f19253db5b97e0fe0c866e331