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

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

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