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