Revert "Removing workaround for battery defender"

This reverts commit ff39fd3e.

Reason for revert: The CL coincided with a start of flakes "phone is locked". Let's revert and see if it fixed that. https://flakes-clusters.corp.google.com/#/?androidAtpBranch=git_master&androidAtpModule=com.google.android.apps.nexuslauncher.out_of_proc_tests&d=30&cid=9fd6b65c-e48c-4bc3-b19b-f5c610a1999a&maxResults=20

Change-Id: I90f8abbb1794c19593ed8a235a82c0e53030c0a2