Merge "Generated UnitsForVehicleProperty.java from VehicleProeprty.aidl" into main