Merge "Fix broken documentation in NfcAdapter" into main am: 71a82818ae am: f61ec5be0f

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

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