[automerger skipped] Avoid including com.android.server.power.stats in...

[automerger skipped] Avoid including com.android.server.power.stats in presubmit twice am: 05c42154 -s ours am: 5d5f9e28 -s ours am: bf6f5b23 -s ours

am skip reason: Merged-In Ifd0de818ee99dfd6e44750f9bff4a6a7ef1e6dd2 with SHA-1 1814dffd is already in history

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



Change-Id: I18fbc258fae443d14d36c246dcd1ffd76a4f7601
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>