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

Change-Id: I53f4ec865273746c6522af1afdaca8f41739676d