Merge "disable a bunch of test failures for CTS 6.0R2" into marshmallow-cts-dev am: ce931517cf
am: ac3911bcbc

* commit 'ac3911bcbcf6e4a0053213737d060f6805875d83':
  disable a bunch of test failures for CTS 6.0R2