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

Merge "[automerger skipped] Prevent read of uninitialized memory am: ae59a1c2 -s ours am: ab74ca43 -s ours am: d0980fc4 -s ours am: 61e620e0 -s ours am: 37904d1d -s ours am: 7c30318c -s ours am: c71e7356 -s ours am: a84ed878 -s ours" into sc-v2-dev-plus-aosp am: 40e7a6d2 -s ours

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

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

Change-Id: I654a63cd346d4acbb51a0b7646c2cc0ba9b6cd75