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