Merge 5ff3e587ab65775c7b5f6cd26c4d2d3ed6902596 on remote branch

Change-Id: I0ce9cd9204d0ba2da3e1b98def05a5e4ffb6bf2e
diff --git a/bridge/src/com/android/layoutlib/bridge/android/BridgePowerManager.java b/bridge/src/com/android/layoutlib/bridge/android/BridgePowerManager.java
index 584e8c2..92d7fdb 100644
--- a/bridge/src/com/android/layoutlib/bridge/android/BridgePowerManager.java
+++ b/bridge/src/com/android/layoutlib/bridge/android/BridgePowerManager.java
@@ -237,6 +237,11 @@
     }
 
     @Override
+    public boolean isAmbientDisplaySuppressedForTokenByApp(String token, int appUid) {
+        return false;
+    }
+
+    @Override
     public boolean isAmbientDisplaySuppressed() {
         return false;
     }