Merge "Add VDM team as owner of the companion Android.bp file" into main am: 9361d76bc3 am: 1512da540c

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2769318

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