[automerger skipped] Merge "Update Secure NFC API definitions" am: 6b6b3322fc
am:78a96339ee-s ours am skip reason: change_id If78d90fdc0a24d5f44bbb582f388a9c60b12786c with SHA12d09e5c41fis in history Change-Id: I728463737f50949e0eff1301aafb423daf912fc3
This commit is contained in: