Merge "nfc: Prepare for NFC codebase move" into main am: 3f4c4881 am: 4635c0d1

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



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