Merge changes from topic "presubmit-am-bed54c4b3fbf4171a0599b645919df07" into tm-qpr-dev-plus-aosp

* changes:
  [automerge] More robust tests. 2p: 21683a939f
  More robust tests.

services/tests/PackageManagerServiceTests/server/src/com/android/server/PackageManagerTests.java

@@ -197,10 +197,11 @@ public class PackageManagerTests extends AndroidTestCase {
         }
 
         public Intent getResult() {
-            try {
-                return mResult.take();
-            } catch (InterruptedException e) {
-                throw new RuntimeException(e);
+            while (true) {
+                try {
+                    return mResult.take();
+                } catch (InterruptedException e) {
+                }
             }
         }
     }