Merge "Add isSameApp to PackageManagerInternal" into tm-dev