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

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

Change-Id: I57c511d4bbebeb18c57b51009e3e1c7fda232467