Merge "Add alarm + media/other to NotifManager.Policy"

diff --cc api/current.txt
Simple merge

diff --cc api/system-current.txt
Simple merge

diff --cc api/test-current.txt
Simple merge

diff --cc media/java/android/media/AudioAttributes.java
Simple merge

diff --cc proto/src/metrics_constants.proto
index 6a8a222,772ce76..9b167c8
--- 1/proto/src/metrics_constants.proto
--- 2/proto/src/metrics_constants.proto
+++ b/proto/src/metrics_constants.proto
@@@ -4658,23 -4634,20 +4658,35 @@@ message MetricsEvent 
      // OPEN: Settings > Developer options > USB debugging > Info dialog
      // CATEGORY: SETTINGS
      // OS: P
 -    DIALOG_ENABLE_ADB = 1161;
 +    DIALOG_ENABLE_ADB = 1222;
 +
 +    // OPEN: Settings > Developer options > Revoke USB debugging authorizations > Info dialog
 +    // CATEGORY: SETTINGS
 +    // OS: P
 +    DIALOG_CLEAR_ADB_KEYS = 1223;
 +
 +    // Open: Settings > Developer options > Quick setting tile config
 +    // CATEGORY: SETTINGS
 +    // OS: P
 +    DEVELOPMENT_QS_TILE_CONFIG = 1224;
 +
 +    // OPEN: Settings > Developer options > Store logger data persistently on device > Info dialog
 +    // CATEGORY: SETTINGS
 +    // OS: P
 +    DIALOG_LOG_PERSIST = 1225;
  
+     // ACTION: DND Settings > Priority only allows > Alarms toggle
+     // SUBTYPE: 0 is off, 1 is on
+     // CATEGORY: SETTINGS
+     // OS: P
+     ACTION_ZEN_ALLOW_ALARMS = 1162;
+ 
+     // ACTION: DND Settings > Priority only allows > Media toggle
+     // SUBTYPE: 0 is off, 1 is on
+     // CATEGORY: SETTINGS
+     // OS: P
+     ACTION_ZEN_ALLOW_MEDIA = 1163;
+ 
      // Add new aosp constants above this line.
      // END OF AOSP CONSTANTS
    }