Merge "Revert "Ensure only com.android.shell can run in the shell domain.""