Merge "MediaSession2: Add CommandGroup#add/removeCommand(int)" into pi-dev am: e711ebc4fa
am: 669ceda153

Change-Id: I77160c04691a98c026a6810f30062d8ebf4fb52b