Merge "Notification: update FLAG_ @IntDef" into main