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

[automerger skipped] NfcAdapter.getNfcAntennaInfo crashes to retrieve NfcAntennaInfo am: e8a15451 -s ours am: 7e0f0f61 -s ours am: 3e5b46fa -s ours am: ff0cb099 -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: Ia46ecebc97c498b8444380d2419145eab9a23038
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>