Used checkPackage to check UID and package

This is our best guess at a fix, but there's unfortunately no way to
verify it currently.

Bug: 150979331
Bug: 146570216
Test: builds
Change-Id: I567639aa789c6c4db8e230d5db4938f92901f44e
Merged-In: I567639aa789c6c4db8e230d5db4938f92901f44e
(cherry picked from commit 4cda45544a1e5d097100afbbb549ec2e6c610763)
(cherry picked from commit 262519f4cf0bd28dfc102775815cceb9f7788e20)
1 file changed