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

Change-Id: I5c2e4dcaee9d608d12f513073ae0f137aa2798e6