Merge "OOBR in nfc_ncif_proc_ee_discover_req()" into qt-dev am: 275a119645 am: 24df2bc393 am: 02e439fe1b

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

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