[automerger skipped] Merge "NfcAdapter.getNfcAntennaInfo crashes to retrieve...

[automerger skipped] Merge "NfcAdapter.getNfcAntennaInfo crashes to retrieve NfcAntennaInfo" into udc-dev am: 3418e6a5 am: 9fa4d9ff -s ours

am skip reason: Merged-In I12fe668d10ab5ddc1fb2fe1420d44a063b0a3df5 with SHA-1 22e6d32e is already in history

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



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