Merge "Remove duplicate MediaStore class" into rvc-dev am: 776c21cbc3 am: 7edb151ff4 am: 3b41295ef1 am: dac1bf24a6

Change-Id: I31adebb3470ab829a51f70f947a83909433d027b