[automerger skipped] Prevent OOB write in phFriNfc_ExtnsTransceive am: 9f6aba10da am: 3be917f594 am: ae8cbb2edd -s ours
am: 0204e29133 -s ours
am skip reason: change_id Ic6e5053b369ead645293c94854431b1c17ed6431 with SHA1 46d00688b8 is in history

Change-Id: I7dd4fa5af18a7a2ac2878da5c18f26c6f06a18e8