Revert^2 "Simplify UIDs in PacakgeInstaller app"

This reverts commit 752d17588f8f22cd4f28513d6c028cbeb884296d.

Reason for revert: This is an incorrect revert. A fix-forward CL will also be uploaded to fix the test breakage. 

Change-Id: I8d08eb6de72f4ac2f5ac0a5c0fef26cc0578f8e9
2 files changed