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

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

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