Merge "nfc(api): Prepare for NFC codebase move" into main am: 6852b4e6d4

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

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