[automerger skipped] Prevent read of uninitialized memory am: ae59a1c2 -s...

[automerger skipped] Prevent read of uninitialized memory am: ae59a1c2 -s ours am: ab74ca43 -s ours

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

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

Change-Id: I9b47392ecb824b7a8043397e60ebadbf5d904230