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

Change-Id: I77bee1479944a701cdf18ec8ca52bddda21a4727