Merge "Reuse a given MediaSessionCompat instead of creating another one" into nyc-support-25.1-dev am: fcddb802a0
am: af43c4364a

Change-Id: If7aa55e244cff09e152306424fb113a27abc3fe3