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

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