Merge "Add an option, --reset-all, to dumpsys batterystats." into tm-dev am:...

Merge "Add an option, --reset-all, to dumpsys batterystats." into tm-dev am: 512b28fa am: 9c53571b am: b5f58750 am: ded96878

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



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