[conflict] Merge "Add a threshold to filter out small power usage in battery...

[conflict] Merge "Add a threshold to filter out small power usage in battery stats." into udc-qpr-dev am: 61e1769c am: 1703db1b

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24476080



Change-Id: Idb5c910e5c8712b8186cdadd24a6190869ac4c1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>