Merge "Avoid including com.android.server.power.stats in presubmit twice" into...

Merge "Avoid including com.android.server.power.stats in presubmit twice" into udc-qpr-dev am: 61a737c6

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



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