[automerger skipped] Merge "convertToPublicCardId returns unsupported on HAL<1.2" am: af64bf9d am: 947423ab
am: 4ad81115 -s ours
am skip reason: change_id I45160deca30032599fbb04976a8140a866295bc1 with SHA1 bc8c44bc is in history
Change-Id: Icb7c4e7aaa5ef0acf2c27aa02f1308397946240b