Merge "Stop active media projections on user switch." into lmp-mr1-dev

automerge: 3292c0e

* commit '3292c0e2640667e5ef78896653a41c85e7de06c5':
  Stop active media projections on user switch.

services/core/java/com/android/server/media/projection/MediaProjectionManagerService.java

@@ -98,6 +98,11 @@ public final class MediaProjectionManagerService extends SystemService
     @Override
     public void onSwitchUser(int userId) {
         mMediaRouter.rebindAsUser(userId);
+        synchronized (mLock) {
+            if (mProjectionGrant != null) {
+                mProjectionGrant.stop();
+            }
+        }
     }
 
     @Override