Merge "disable a bunch of test failures for CTS 6.0R2" into marshmallow-cts-dev am: ce931517cf am: ac3911bcbc am: 0cbc5fb8d9 am: eea505eb8e am: 3701c7cd66
am: 450fca6dad

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