Merge "Revert "Collect NeededUriGrants without holding locks."" into qt-dev
am: 2aa255a746

Change-Id: I66ed29edc5c3079984ec205d629bb1d3f587a09c