Merge "DO NOT MERGE CtsVerifier: Remove failed cases in BYOD Disable NFC beam" into lollipop-mr1-cts-dev am: e771efe6f0  -s ours am: a22efb407b
am: e880e62e4b

* commit 'e880e62e4b4c5097fad4034b873d8c86d72b82ec':
  DO NOT MERGE CtsVerifier: Remove failed cases in BYOD Disable NFC beam