Merge "Support test skipping when power save modes aren't enabled." am: 57538e6b

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



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