am bc84bc01: am 199a3b58: Merge "Revert "Fix for ByodFlowTestActivity"" into lollipop-mr1-cts-dev

* commit 'bc84bc0125c08228ad9cd75450c2bb6766dec46a':
  Revert "Fix for ByodFlowTestActivity"