Merge "Merge "Collect NeededUriGrants without holding locks." into qt-dev am: aac39e204d am: 9b7de6514b" into qt-r1-dev-plus-aosp