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

Change-Id: I00aac0efccbf11df40def1bd19e305f89b24da83