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