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

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

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