Merge "MediaSessionCompat: Refactor test code" into nyc-support-25.3-dev