[automerger skipped] Merge "Fix OOB read in parseInputs in ShimPreparedModel.cpp" into sc-dev am: d36d3f9375 -s ours am: 65ff7dcda4 -s ours am: b5b2c3e39b -s ours

am skip reason: Merged-In Ib93baacd45f394568eb789b5196a5d0b4e1edd41 with SHA-1 987ffdf1fc is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NeuralNetworks/+/23219027

Change-Id: I296743a5c3eb64c5a7d209752ecaf82289f571ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>