Merge "Add defer-until-active policy to ACTION_SCREEN_ON/OFF."

services/core/java/com/android/server/power/Notifier.java

@@ -240,6 +240,8 @@ public class Notifier {
         options.setDeliveryGroupMatchingKey(
                 UUID.randomUUID().toString(),
                 Intent.ACTION_SCREEN_ON);
+        // This allows the broadcast delivery to be delayed to apps in the Cached state.
+        options.setDeferUntilActive(true);
         return options.toBundle();
     }