Merge "Merge "Revoke prior uri grants when MediaProvider db gets recreated."...
Merge "Merge "Revoke prior uri grants when MediaProvider db gets recreated." into qt-dev am: 75fb684e am: a73dd14d" into qt-r1-dev-plus-aosp
am: 0f9cf16a
Change-Id: Idbd4df376ee54185db609911935693b97a29c5f5