[automerger skipped] Merge "Include binder stats in battery stats" am:...

[automerger skipped] Merge "Include binder stats in battery stats" am: 83d1954a am: 797210a9 -s ours am: eafad7c9 -s ours

am skip reason: Merged-In I2234776d710adf73c363bdfa6a334f3a6f36d986 with SHA-1 d2e374b6 is already in history

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

Change-Id: I2554e61b93ea553dc6a071dbed980787f853585d