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