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

Change-Id: I184df5f20021ae602fae9411663c97185c1329e5