Merge "OOBR in nfc_ncif_proc_ee_discover_req()" into qt-dev am: 275a119645 Original change: https://googleplex-android-review.googlesource.com/c/platform/system/nfc/+/17310817 Change-Id: Idb30c6f30d4a44171ab4cbe23ed6e4b1f056b724 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>