Merge "Rank ChooserTargets using appTarget#rank instead of shortcut#rank....

Merge "Rank ChooserTargets using appTarget#rank instead of shortcut#rank. AppTarget#rank contains the score passed from AppPredictionService." into rvc-dev am: 14eea93f am: 445cdaaf am: 140bcdc0

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

Change-Id: Icd4cda52eb49a4ac6b1cd57fd04894ed6447045d