Merge "Move timeout from RankerResolverServiceComparator to abstract class." into qt-dev
am: b6b549baf6

Change-Id: I8af075472196af416f8859a639961acde4dc7dbe