Merge "Revert "Revert "Removing workaround for battery defender""" into sc-v2-dev am: b3e8d11b9f

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15476265

Change-Id: If676f2d6c42beb45407961740df93ed98554b779