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: I8b586f296f53375c75e0625163bd6545e67e7017