Merge "NotiViewWrapper: Fix test that breaks on master" into oc-dev

diff --cc packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/NotificationViewWrapperTest.java
index 2c49f99,7a72afd..0dad52f
--- 1/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/NotificationViewWrapperTest.java
--- 2/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/NotificationViewWrapperTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/NotificationViewWrapperTest.java
@@@ -38,10 -37,9 +38,10 @@@ public class NotificationViewWrapperTes
          mContext = InstrumentationRegistry.getTargetContext();
      }
  
 +    @Ignore("Broken")
      @Test
      public void constructor_doesntUseViewContext() throws Exception {
-         new TestableNotificationViewWrapper(mContext, new View(null /* context */), null /* row */);
+         new TestableNotificationViewWrapper(mContext, null /* view */, null /* row */);
      }
  
      static class TestableNotificationViewWrapper extends NotificationViewWrapper {