Merge "Nfc AIdl interface updated following" into main am: e8ba6317 am: c070e1ba

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3160704



Change-Id: Ifc5f76e95f0764d0493028e13a56a292b70900cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>