Merge "Collect NeededUriGrants without holding locks." into qt-dev
am: aac39e204d

Change-Id: I1c2720586a74d248219c275fe7a7986e47117766