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 am: 4183c985

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



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