[automerger skipped] Merge "Initialise VPS buffer to NULL in constructor" into sc-dev am: af9a72055f am: 3a51ca68d7 am: ab1cb63601 am: 7b407fbcad am: 84d1a3ef84 am: 3fc09d16bb -s ours am: 4ed380fde5 -s ours am: f8070b698c -s ours am: 3e6c5dc4ad -s ours am: fa0a531c33 -s ours

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

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

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