Merge "Fix indentation in dumpsys package"