Merge "Revert "Revert "Update PackageInfo APIs to reflect shared UID st..."" into tm-dev