Merge "IBatteryStats.aidl update path" am: 2a27671122

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

Change-Id: I0679988981358ea676cacf6d1c5962d3057ebf57