Include horizontal and vertical gap in the count of Key.isOnKey

This change also reverts I8f6102d6 and considers that the point is on
the key while sorting in proximity key detection.

Bug: 4348994
Change-Id: I3ee913675e28da7e7b164805a7a683f0814b38b9