Merge "Remove DrmInitialization from IDataSource" am: bc0d257bbe
am: 82fe8f2d3e

Change-Id: I3ddb99b34acdd870144a5f1324d137fc7a403741