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

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

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