Merge "DO NOT MERGE [CtsVerifier] Removing battery usage settings test in BYOD flow" into marshmallow-cts-dev
am: d28986b0ec  -s ours

* commit 'd28986b0ec4df372a8d5af4ee66c6ad6bd8a020f':
  DO NOT MERGE [CtsVerifier] Removing battery usage settings test in BYOD flow

Change-Id: I3550e8cd2f58589829931ebca839e62f0d958b0d