Merge "Revert "Simplify UIDs in PacakgeInstaller app"" into main