Revert "Revert^2 "Revert "Move Nearby to the front of the app list."""

This reverts commit ffc1dc5709c794effc8b2e7b0761a80ecc8abb77.

Reason for revert: Removing the offending portion of the test in ag/22815196

Change-Id: I8787f57e570e7fe2fe8bcb38aef33d14ae694d8d
13 files changed