[automerger skipped] [automerger] DO NOT MERGE Fix potential OOB read in...

[automerger skipped] [automerger] DO NOT MERGE Fix potential OOB read in sdpu_get_len_from_type am: abd0cc42 am: 9ad01a68 am: d8406109 am: 2c79c0ac skipped: fc87c914 am: 56e349cb am: 3a57683c am: 68112e65 -s ours
am: a36c28bc -s ours
am skip reason: subject contains skip directive

Change-Id: If1c8417e32909db7846cf1256dbb5b19642983e1