am e1df8224: Merge change 23173 into donut

Merge commit 'e1df82248a68282a4d556ce61db09949fc186827' into eclair

* commit 'e1df82248a68282a4d556ce61db09949fc186827':
  Remove flaky test LifecycleTest.testDialog from large continuous suite.