Merge "[pm] copy some fields from AndroidPackage to PackageState" into main