Merge "Fixing comments on AvailableNfcAntenna" am: b55d142b23 am: 4bf9ebdde2

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

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