Merge "Add a threshold to filter out small power usage in battery stats." into...

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

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



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