Merge "Prevent system_server shutdown when trying to format external storage"