Merge "Update filter logic for BatteryDiffEntries" into sc-dev am: a6a4fe474c

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

Change-Id: If4b2d991ddd95391b987246e40a6b34a5cd5b958