[automerger skipped] Merge "nfc(frameworks): Move NFC codebase to...

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

am skip reason: Merged-In I19e2b59273c4278d1cef268d6d0bbe0dac6b28e5 with SHA-1 7bf85fd1 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3427989



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