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

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

Change-Id: If052ba67117e377e1db06c1f2a19159593a73d2d