Merge "Fix flaky media key event related CTS tests" into rvc-dev am: 7feac4ed47 am: 1d658df5e3 am: f032d382ee am: 87bd6eff71

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

Change-Id: Ie976d07aa5d2b9b4dc917413fb01ae6c5f0a5347

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);