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

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

Change-Id: Ifd6c72541b0888d5173d9237eeb2cf5c576f2299