Merge "If device config has a NAS related message, also enable importance adjustments" into qt-qpr1-dev

services/core/java/com/android/server/notification/NotificationManagerService.java

@@ -1833,6 +1833,7 @@ public class NotificationManagerService extends SystemService {
                     }
                     if (properties.getKeyset()
                             .contains(SystemUiDeviceConfigFlags.NAS_DEFAULT_SERVICE)) {
+                        mAssistants.allowAdjustmentType(Adjustment.KEY_IMPORTANCE);
                         mAssistants.resetDefaultAssistantsIfNecessary();
                     }
                 });