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
am: e5364a0b3f  -s ours

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