Merge "Removing workaround for battery defender"

        return mDevice;

    }

    private boolean hasSystemUiObject(String resId) {

        return mDevice.hasObject(By.res(SYSTEMUI_PACKAGE, resId));

    }

    @Before

    public void setUp() throws Exception {

        Log.d(TAG, "Before disabling battery defender");

        mDevice.executeShellCommand("setprop vendor.battery.defender.disable 1");

        Log.d(TAG, "Before enabling stay awake");

        mDevice.executeShellCommand("settings put global stay_on_while_plugged_in 3");

        for (int i = 0; i < 10 && hasSystemUiObject("keyguard_status_view"); ++i) {

            Log.d(TAG, "Before unlocking the phone");

            mDevice.executeShellCommand("input keyevent 82");

            mDevice.waitForIdle();

        }

        Assert.assertTrue("Keyguard still visible",

        Assert.assertTrue("Keyguard is visible",

                mDevice.wait(

                        Until.gone(By.res(SYSTEMUI_PACKAGE, "keyguard_status_view")), 60000));

        Log.d(TAG, "Keyguard is not visible");

        final String launcherPackageName = mDevice.getLauncherPackageName();

        try {