[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: 7e2598f714 -s ours
am skip reason: change_id I127fe1445b79d7f00cf4835961a83ed5410722d8 with SHA1 499e39c020 is in history

Change-Id: I68e20f89b9d1c6e193c2070ba7726a818e3c0756