Merge "Merge "Move timeout from RankerResolverServiceComparator to abstract...
Merge "Merge "Move timeout from RankerResolverServiceComparator to abstract class." into qt-dev am: b6b549ba" into qt-dev-plus-aosp
am: bf78b88d
Change-Id: I61fb4043e752dc9cc63cc362d391a04a0595427f