[automerger skipped] Merge "Initialise VPS buffer to NULL in constructor" into...

[automerger skipped] Merge "Initialise VPS buffer to NULL in constructor" into sc-dev am: af9a7205 am: 3a51ca68 am: ab1cb636 am: 7b407fbc am: ef917330 am: 0f4e7191 am: 49206484 -s ours

am skip reason: Merged-In I08eacd7a0201bc9a41b821e20cae916d8870147a with SHA-1 0efe2b4d is already in history

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



Change-Id: I598481a02570800c7b18f023f61c806a902d4106
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>