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

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

Change-Id: I4d65c73eb86564bd0785f76ae41f67d2d9f7520d