Merge "nfc(api): Separate out NfcExtras from nfc APIs (2/2)" into main am: 867815f0be am: 90e7909fa6 am: 096034c717

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

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