Merge "MediaSession2: Convert DataSourceDesc to MediaItem2 in MyPlayerEventCallback" into pi-dev am: b0179a3a44
am: 0cbac17c98

Change-Id: Ia32f2e68d1317bfbc5aab20b6b255d3a59c45207