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

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

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