Merge "Make com.android.shell request MANAGE_EXTERNAL_STORAGE"