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

Change-Id: Ib1b97e7a56015430a6d2599d1ed9bc77d1ef8d67