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