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

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

Change-Id: Icc427a957902639665b458d17ab37d4a6486f833