Merge "Add MILLI_SECS to VehicleUnit.aidl"