[automerger skipped] Merge "Add plumbing to collect Binder stats for battery attribution" am: e6a97f86 am: 464a14b5 -s ours

am skip reason: Merged-In Icbccd26e20bc4ead13ffeac76b851af39269ca89 with SHA-1 305ee3e9 is already in history

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

Change-Id: I10dd710f3f3d68deaf983c2325d9715df72429c5