Merge "Add testDeviceDoesNotSupportUserspaceReboot"