Merge "Add AppPredictionServiceResolverComparator" into qt-dev
am: ba3b157e32

Change-Id: I385cc811982f84186748b8565269fc40b4d6779a