Merge "Adding flag com.android.server.notification.notification_lock_screen_settings to trunk_staging." into main