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