Merge "Merge "Update documntation for getCardId" into qt-dev am: 39585b62ff" into qt-dev-plus-aosp
am: d1a452540e

Change-Id: Ifb325fe7af956b006a69f9275b6416fb0056d746