Merge "libbinder - split out libbatterystats_aidl" am: 3d5d07b39f am: f63578a6cd

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1661236

Change-Id: Ib6fecef10e361c61f402f5a68048e1b7bca9fd40