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: 7a0a92b9 am: 9cf56997

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



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