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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icc79e309d09a57783f1cf59578a5ae9ea8c11c35