Merge "Improve `UriPermissionTest` flakiness." into main