Merge "Skip tests that unplug the battery on batteryless devices" into stage-aosp-sc-ts-dev