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

Change-Id: I2ec42aae2b5a539e4f7c6c2ed7b0427aaa18b4d9