Merge "nfc(api): Separate out NfcExtras from nfc APIs (2/2)" into main am: 867815f0 am: bf481386 am: 228a3848

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



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