[automerger skipped] Merge "Support test skipping when power save modes aren't enabled." am: 57538e6b92 am: e55d075b37 am: d3deb1ca5d -s ours am: 0a29a5946f -s ours am: d228589588 -s ours
am skip reason: Merged-In Icc64fbe75213386a1f41fae258e50c4032920b0a with SHA-1 ba3b5d7e53 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2635501
Change-Id: Ia86499e02568c8388385ff77874605c45e0d0b8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: