[automerger skipped] Create Power Stats AIDL interface am: 0cca4d02 am:...

[automerger skipped] Create Power Stats AIDL interface am: 0cca4d02 am: 5f59ddf5 am: cb7ad026 -s ours

am skip reason: Change-Id I195ace557e1db2894d12f6f15d4db494d358c8e8 with SHA-1 83ee8771 is in history

Original change: https://android-review.googlesource.com/c/platform/build/+/1575997

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0727aa80935bd4da0966cbafe6166fdd629c15a8