Merge "Update batteryDiffEntry filter condiction" into sc-dev am: 4c1b805cef
am: 68e0560669
am: dd37503830
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15080731 Change-Id: I31ad963e21e91392f12538394aa3081a9bb5bd08
This commit is contained in: