Merge "Fix a couple of OOB read bugs found by the fuzzer." into udc-dev am: 26cc654a

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



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