Merge "Enable dumpsys car_service" into pi-dev