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