[automerger skipped] Merge "Add BATTERY_STATS_OWNERS for IBatteryStats.aidl"...

[automerger skipped] Merge "Add BATTERY_STATS_OWNERS for IBatteryStats.aidl" into sc-dev am: 47ed1840 -s ours

am skip reason: Change-Id Iffb8ded9ff5edc899ab38c74ffe3ad98793ca67c with SHA-1 1ef5d3f8 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9c83dc730bfb64f7f5aeb06fc554cca946395c05