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