Merge "MediaSession2: Change return type of CommandGroup#getCommands()" into pi-dev am: d21b33d8ca
am: d3cc889fbc

Change-Id: I45eee1b4aa2a59f5d1e59f52ae83c94f6f097708