[automerger skipped] OOB write in rw_t2t_handle_tlv_detect_rsp am: 975d2564e7 am: 0968938bef am: f489188394 -s ours am: 77c05d2e9d -s ours am: b661207e6f -s ours
am skip reason: Change-Id I44a3f26afb3591d1a94e2e0d7a8b1619beeaa7d6 with SHA-1 5fbc3a8889 is in history

Change-Id: I1d094db072ad2e3df250d7f81fb9a61ec70bfcca