Merge "Fix AppBatteryPreferenceControllerTest test fail" into sc-dev am: 75d3635712
am: e4629ec709
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14860446 Change-Id: Ibfc8297b98691848d903617657364f3869e8993a
This commit is contained in: