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