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

am skip reason: skipped by user aquilescanta

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If5a95314df919d7b9c6e0270752e2337d7a76242