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

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