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

Change-Id: I5096120ecd7c2959724e7e16f6d0a0c3712c18fa