Merge \"Teach persistable Uri grants about direct boot\" into nyc-dev
am: 7014eef54a

Change-Id: I8b4d95a7128829de62f3eb795dc275c373890be5