[automerger skipped] Prevent read of uninitialized memory am: f8c7ecf656 am: 559114ac1c -s ours am: cc8061888f am: 5faae759e2 -s ours am: 0ab3b2d177 -s ours

am skip reason: Change-Id Ib6a3d24e07915e8af9d019e54d0501b74aa4671d with SHA-1 f8c7ecf656 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I39b809fef05ecd1e57357aa2c20b9a79da36caf2