Merge "Update Android VDM team name" into main