am: Fix mismerge

 * The removal of this code was missed out
   during merge of tag 'android-6.0.1_r74'

Change-Id: I57dc035f79b7e20c09a21d5242c20370ad6d34ce

Author: bgcngm

services/core/java/com/android/server/am/ActivityManagerService.java

@@ -3663,15 +3663,6 @@ private final void startProcessLocked(ProcessRecord app, String hostingType,
                         true /*replacingPid*/);
             }
             synchronized (mPidsSelfLocked) {
-                ProcessRecord oldApp;
-                // If there is already an app occupying that pid that hasn't been cleaned up
-                if ((oldApp = mPidsSelfLocked.get(startResult.pid)) != null && !app.isolated) {
-                    // Clean up anything relating to this pid first
-                    Slog.w(TAG, "Reusing pid " + startResult.pid
-                            + " while app is still mapped to it");
-                    cleanUpApplicationRecordLocked(oldApp, false, false, -1,
-                            true /*replacingPid*/);
-                }
                 this.mPidsSelfLocked.put(startResult.pid, app);
                 if (isActivityProcess) {
                     Message msg = mHandler.obtainMessage(PROC_START_TIMEOUT_MSG);