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

[automerger skipped] Merge "NfcAdapter.getNfcAntennaInfo crashes to retrieve NfcAntennaInfo" into udc-dev am: 3418e6a5 am: ad14d859 -s ours am: 38f29e8c -s ours am: ed74e0e2 -s ours

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

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



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