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
Test: builds
Change-Id: I567639aa789c6c4db8e230d5db4938f92901f44e
1 file changed