Merge "Fix battery saver not disabling adaptive sleep switch" into sc-dev am: b8c610b188
am: 02c941968f
am: cc26673d5e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14923591 Change-Id: I82511d22ca4f979b180bcc62b52f5310ac10ae97
This commit is contained in: