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

Change-Id: Ie85042b706ad9782bf35042bff42735d8061702b