Merge "Remove userSerial param from vold methods that don't use it" into main