[automerger skipped] Prevent read of uninitialized memory am: f8c7ecf6 am:...

[automerger skipped] Prevent read of uninitialized memory am: f8c7ecf6 am: 559114ac -s ours am: cc806188 am: 5faae759 -s ours

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5ef31e63d1102bed67de4a9c95e9784b84464b29