Merge "Rank ChooserTargets using appTarget#rank instead of shortcut#rank. AppTarget#rank contains the score passed from AppPredictionService." into rvc-dev am: 14eea93f57 am: c19bd9220a am: cf6ce36350 am: 781d1b8099

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11997576

Change-Id: I44917004b7224e8ac3f084f7aec7766bffdfbea2