Merge "Compatibility fix for apps that construct Notification.Builders early" into lmp-preview-dev