am b81df8e3: Merge change I5535bbdf into eclair

Merge commit 'b81df8e3a2f72546508fcdf92adc39cfa2985c56' into eclair-plus-aosp

* commit 'b81df8e3a2f72546508fcdf92adc39cfa2985c56':
  Disable flaky and failing tests.