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