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

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