Merge "nfc(api): Separate out NfcExtras from nfc APIs (2/2)" into main am: 867815f0be am: bf4813861b

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

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