Merge "Merge "Card ID APIs are public" am: bd4a4dc889" into stage-aosp-master
am: 22a8239b6a

Change-Id: If3f27b835cacaff13d19d8dbe36d59b4f2265439