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

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

Change-Id: Id8d097d0899752018b48d791a93e204b893f93b0