Merge "Avoid including com.android.server.power.stats in presubmit twice" into main am: 23e53c1c7e

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

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