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

Change-Id: I29a47a55411ac1b99f206660d8fbfb3167744396