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

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

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