Merge "Cleanup unused Notification.Builder.makeAmbientNotification()" into main