Merge "Remove duplicate MediaStore class" into rvc-dev am: 776c21cbc3 am: 47fae0e567 am: 0fa10f18ba am: a21f45bf43

Change-Id: Ia0c7091927126a7da4f0cd5bf16a92c2471e728a