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

Change-Id: Ie3589a579db30257366d9e73647596775abde9f9