Merge "MediaSession2: Revisit command code" into pi-dev
am: ec0ab63ccb

Change-Id: I2827f7099008ebee00f9193e40258b74a0f5afec