Merge "IBatteryStats.aidl update path" am: 2a27671122 am: 0fd713954b am: 7c8edecd6d

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

Change-Id: Ief137e0a515e75737148c474bbdfa2f89be10952