Merge "Modify MediaGrants.removeMediaGrantsForPackage query." into udc-mainline-prod