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

Change-Id: Ie4d1fd9bd6a732fdd293e2dbcf8a7c9f541e1efb