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

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

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