Merge "GenericSource: reset mDrmManagerClient when mDataSource is cleared." into mnc-dr-dev