Merge "MediaSession2: Replace PlaybackState2" into pi-dev am: 15d3ba624c
am: f0e87128bf

Change-Id: If1a3c8ef22324bd5bf3fb59e970ef75631e7bcf8