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