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

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

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