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

[automerger skipped] Merge "NfcAdapter.getNfcAntennaInfo crashes to retrieve NfcAntennaInfo" into udc-dev am: 3418e6a5 -s ours am: b9a8a50d -s ours am: 084d65fc -s ours am: 733f0685 -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: I9d54b5d936303f5898e5fa135b442ecb0655da79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>