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

Change-Id: I012e0f881469d14f04926f3077d24b41b203d4e9