[automerger skipped] Merge "nfc(vts): Move NFC codebase to packages/modules/Nfc" into main am: 617bbc66c3 -s ours

am skip reason: Merged-In I9f37009d52c89ac5493e3035394a7994bd5e7d65 with SHA-1 c4654554d3 is already in history

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

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