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

Change-Id: I813df44ab9fa6ef49c5ff038b64cbbca318fdf27