Merge "Release virtual display before stopping projection" am: 2bd3073819

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1585286

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I36b1adc30f515e5a699cfd433d44921667c1a353

packages/SystemUI/src/com/android/systemui/screenrecord/ScreenMediaRecorder.java

@@ -187,12 +187,12 @@ public class ScreenMediaRecorder {
      */
     void end() {
         mMediaRecorder.stop();
-        mMediaProjection.stop();
         mMediaRecorder.release();
-        mMediaRecorder = null;
-        mMediaProjection = null;
         mInputSurface.release();
         mVirtualDisplay.release();
+        mMediaProjection.stop();
+        mMediaRecorder = null;
+        mMediaProjection = null;
         stopInternalAudioRecording();
 
         Log.d(TAG, "end recording");