[automerger skipped] VT: Wrong size buffer allocation of vps/sps/pps. am:...

[automerger skipped] VT: Wrong size buffer allocation of vps/sps/pps. am: b3508ea2 am: dd180388 am: 535b8e27 -s ours

am skip reason: Merged-In Ia07090468e382b3a4bf62e3ca5659e292e7ee3a5 with SHA-1 b3508ea2 is already in history

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

Change-Id: Ibad78d77e4861a95462efe5ed6e223b27e2830a7