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: 2372d8e8

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



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