Merge "Revoke prior uri grants when MediaProvider db gets recreated." into qt-dev
am: 37a8988abe

Change-Id: I6a1e51d763297ea9a6c5486c26bbd17866a1f15e