Merge "Nfc AIdl interface updated following" into main am: e8ba631772

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

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