Merge "MediaSessionCompat: Fix NPE" into nyc-support-25.1-dev