Merge "Backport AggregationSuggestion URI builder" into ub-contactsdialer-b-dev am: d23b633b26 am: 0e55a6d
am: 262dd30

* commit '262dd3034ec8436ea89723d7e6fc6a40d7494141':