[automerger skipped] Merge "Avoid including com.android.server.power.stats in presubmit twice" into main am: 23e53c1c7e -s ours

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

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

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