Merge "Batteryless device can not pass com.android.cts.deviceandprofile.systemupdate.installUpdateTest"