[automerger skipped] Merge ""DO NOT MERGE" Fix test case relying on battery saver status." into pie-cts-dev
am: 661f9a464c -s ours
am skip reason: subject contains skip directive

Change-Id: I33539c94a1535eb5d587617b95c366e5556599b1