Merge "Fixed a flakey test" into oc-mr1-dev

am: e501718337

Change-Id: Ie634dcd4fc79945447987126755c94a6fd7c2233

packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/NotificationInflaterTest.java

@@ -185,7 +185,9 @@ public class NotificationInflaterTest extends SysuiTestCase {
         countDownLatch.await();
     }
 
+    /* Cancelling requires us to be on the UI thread otherwise we might have a race */
     @Test
+    @UiThreadTest
     public void testSupersedesExistingTask() throws Exception {
         mNotificationInflater.inflateNotificationViews();
         mNotificationInflater.setIsLowPriority(true);