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

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

Change-Id: I559a105b32b9b861ac7d407dfe58f65f1f2a4273