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

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

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