Merge "Make adb team OWNERS of all Adb settings" into main