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

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

Change-Id: I599df4f57a845d1a10d64f64ef2f590dc6aa7f89