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

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

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