Merge "Merge "Nfc adapter randomly returns null on devices having Nfc" into rvc-qpr-dev am: aadceeb1" into rvc-qpr-dev-plus-aosp am: 7ec24d76

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie46f5e59fe37fae2f011d3c854b08e558c932c04