Merge "Make Notification.ProgressStyle.createProgressModel /** @hide */ public" into main