Merge "Teach persistable Uri grants about direct boot" into nyc-dev