Merge "Fix flaky media key event related CTS tests" into rvc-dev am: 7feac4ed47

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

Change-Id: I8ceaf8014bd761b801b60ea91d5c061accde5160

apex/media/framework/java/android/media/MediaSession2.java

@@ -404,7 +404,7 @@ public class MediaSession2 implements AutoCloseable {
                 mCallback.onPostConnect(MediaSession2.this, controllerInfo);
                 connected = true;
             } finally {
-                if (!connected) {
+                if (!connected || isClosed()) {
                     if (DEBUG) {
                         Log.d(TAG, "Rejecting connection or notifying that session is closed"
                                 + ", controllerInfo=" + controllerInfo);