Merge "Remove DrmInitialization from IDataSource"
am: bc0d257bbe

Change-Id: I1423a52edff5d3abb2bdf82010263e4d0c71860d