[automerger skipped] Merge "Prevent OOB write in nfc_ncif_proc_ee_discover_req" into oc-dev am: a9a4144fdf am: 4bef118edb
am: cd62d7c136 -s ours
am skip reason: change_id I127fe1445b79d7f00cf4835961a83ed5410722d8 with SHA1 499e39c020 is in history

Change-Id: I00f48a60b21a7b34b324d4b1d5b3b8827e75bef7