[automerger skipped] Merge "Fix a couple of OOB read bugs found by the...

[automerger skipped] Merge "Fix a couple of OOB read bugs found by the fuzzer." into udc-dev am: 26cc654a am: 8de6e133 -s ours

am skip reason: Merged-In Ibe4751f50db53fd8842b9f1088b0586c0828e4a4 with SHA-1 966ee8f6 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/22168435



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