Merge "Fix battery saver switch test case" into udc-dev am: e4058d20

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



Change-Id: I8158359950190992acbab484f1d369c4d06ab780
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>