Merge "Update Secure NFC API definitions"
am: 6b6b3322fc

Change-Id: Ieb92b84e1a4c1a9b037fb0b980c55e9ef3f48f6c