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

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

Change-Id: I9c8acb045c17ec4d225b485fccb04f580ee9ce05