Merge "Fix AssertionFailedError in MediaSessionCompatTest" into nyc-support-25.1-dev