Revert "Only check uid when comparing apps"

This reverts commit d79fe1e2.

Reason for revert: b/418640774, b/422332061
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:c725888b6064d96f6b64f34bafa5fc9a40bdffa1)
Merged-In: Icaba4bf8f4d96ff5e058a0cb01b4e9a8ffa429de
Change-Id: Icaba4bf8f4d96ff5e058a0cb01b4e9a8ffa429de