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

[automerger skipped] Prevent read of uninitialized memory am: 6f400642 -s ours am: 0e946007 -s ours

am skip reason: Merged-In Ib6a3d24e07915e8af9d019e54d0501b74aa4671d with SHA-1 f8c7ecf6 is already in history

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

Change-Id: I81efb03ee3855cc79869378becc6c6980fce63f7