am 5584be33: Merge "Improve AlertDialog_BuilderTest Stability" into ics-mr1

* commit '5584be33475767d1a381d0daff67990d6c1d28d4':
  Improve AlertDialog_BuilderTest Stability