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
am: 074594d613

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