Merge "Fix battery saver not disabling adaptive sleep switch" into sc-dev am: b8c610b1 am: 839f9e63

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

Change-Id: I94283a39e0fb2d0143122608ffcb343c8176ae4e