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

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

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