Merge "Remove MediaController2 usages in MediaSessionServiceImpl"