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

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

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

Change-Id: I8d8f6ffd9792d8a600f17e7a20757f7950905d60