Merge "Merge "Revoke prior uri grants when MediaProvider db gets recreated." into qt-dev am: 75fb684e00 am: d90bb5b00f" into qt-r1-dev-plus-aosp
am: 31f32fa078

Change-Id: I1981c5e3aa92cb3bca797ceb623249ae68685bd1