Merge "MediaController2: Remove MediaPlaylistAgent in the ControllerCallback" into pi-dev am: a7fac1c115
am: 17c6654eb5

Change-Id: I62e9b70a5cfeaf815667796ed170dfec0bf7fbcd