Fix deadlock in MediaProvider
am: bae406124f

Change-Id: I918d2b902f99d3b417c542930c976992db0a6807