Merge "Fix build due to missing abstract method impl" into nyc-dev

tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java

@@ -1798,6 +1798,12 @@ public final class BridgeContext extends Context {
         return null;
     }
 
+    @Override
+    public Display getDisplay() {
+        // pass
+        return null;
+    }
+
     @Override
     public int getUserId() {
         return 0; // not used