Merge "nfc(api): Separate out NfcExtras from nfc APIs" into main am: 16043abeca am: d394d57659 am: ebe3fcf8fe

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

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