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

Change-Id: I69767e4cc01b3f7a402fc9a0f18c1ac905706a49