Merge "Fix 5489985: Handle the exception when the external volume has not been added to MediaProvider." into ics-mr1