Merge "Revert "Revert^2 "Revert "Move Nearby to the front of the app list."""" into udc-dev am: df944c13e3

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/IntentResolver/+/22815058

Change-Id: Ia393e12d6ff254fcb38aa75c09d49614b179cf04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>