Merge "OOBR in nfc_ncif_proc_ee_discover_req()" into qt-dev am: 275a119645 am: 24df2bc393 am: 02e439fe1b am: 47949b9235 am: 6570e08034 am: 300b5c4c1d am: a1e53fc1e8 am: a0ba42539f

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/nfc/+/17310817

Change-Id: Ia503e350755a964990cead7609cd719089ef8e59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>