Merge "Prevent read of uninitialized memory" into rvc-dev am: b9b352687e am: 2d174cc274

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0fc18070a3df159102ecba8acfbd96d845289278