[automerger skipped] Merge "ID3Test: Use DataSourceHelper" am: 6c96fda768 am: bca125b432 -s ours am: f96659067d -s ours am: 6e8e0c1659 -s ours

am skip reason: Change-Id Iaeb8cab866b98dcf97f81d3ade4a1c8d26add3a5 with SHA-1 a7847b3f7c is in history

Change-Id: I99b1945048f5b2ad91925d0b862f5a96af32f5e4