Revert of [BattOr][Telemetry] Changes needed to run BattOr tests on telemetry.

Revert of [BattOr][Telemetry] Changes needed to run BattOr tests on telemetry. (patchset #5 id:100001 of https://codereview.chromium.org/1980773002/ )

Reason for revert:
Reverting since this is causing redness on the waterfall (tested with a local revert):

https://build.chromium.org/p/chromium.perf/builders/Linux%20Perf%20%283%29/builds/16426/steps/tracing.tracing_with_debug_overhead/logs/stdio

Note that https://codereview.chromium.org/1998673003/ also needed to be reverted.

Original issue's description:
> [BattOr][Telemetry] Changes needed to run BattOr tests on telemetry.
> 
> Small changes required to push battor data through to telemetry results and disable charging.
> 
> BUG=catapult:#2309
> 
> Committed: https://chromium.googlesource.com/external/github.com/catapult-project/catapult/+/20d5ca9cc4f3c1612f8a0e29e4d5cfa6f146cbfc

TBR=nednguyen@google.com,charliea@chromium.org,rnephew@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=catapult:#2309

Committed: https://chromium.googlesource.com/external/github.com/catapult-project/catapult/+/c5946d3f3c6f9f04ed893e508f01289502a598c4

[Sami, 2016-05-20 13:03:26]

Created Revert of [BattOr][Telemetry] Changes needed to run BattOr tests on
telemetry.

[commit-bot: I haz the power, 2016-05-20 13:03:36]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1999073002/1
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1999073002/1

[commit-bot: I haz the power, 2016-05-20 13:03:43]

Description was changed from

==========
Revert of [BattOr][Telemetry] Changes needed to run BattOr tests on telemetry.
(patchset #5 id:100001 of https://codereview.chromium.org/1980773002/ )

Reason for revert:
Reverting since this is causing redness on the waterfall (tested with a local
revert):

https://build.chromium.org/p/chromium.perf/builders/Linux%20Perf%20%283%29/bu...

Note that https://codereview.chromium.org/1998673003/ also needed to be
reverted.

Original issue's description:
> [BattOr][Telemetry] Changes needed to run BattOr tests on telemetry.
> 
> Small changes required to push battor data through to telemetry results and
disable charging.
> 
> BUG=catapult:#2309
> 
> Committed:
https://chromium.googlesource.com/external/github.com/catapult-project/catapu...

TBR=nednguyen@google.com,charliea@chromium.org,rnephew@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=catapult:#2309
==========

to

==========
Revert of [BattOr][Telemetry] Changes needed to run BattOr tests on telemetry.
(patchset #5 id:100001 of https://codereview.chromium.org/1980773002/ )

Reason for revert:
Reverting since this is causing redness on the waterfall (tested with a local
revert):

https://build.chromium.org/p/chromium.perf/builders/Linux%20Perf%20%283%29/bu...

Note that https://codereview.chromium.org/1998673003/ also needed to be
reverted.

Original issue's description:
> [BattOr][Telemetry] Changes needed to run BattOr tests on telemetry.
> 
> Small changes required to push battor data through to telemetry results and
disable charging.
> 
> BUG=catapult:#2309
> 
> Committed:
https://chromium.googlesource.com/external/github.com/catapult-project/catapu...

TBR=nednguyen@google.com,charliea@chromium.org,rnephew@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=catapult:#2309

Committed:
https://chromium.googlesource.com/external/github.com/catapult-project/catapu...
==========

[commit-bot: I haz the power, 2016-05-20 13:03:43]

Committed patchset #1 (id:1) as
https://chromium.googlesource.com/external/github.com/catapult-project/catapu...