Merge "PackageInfo is a class, not a struct" into lmp-dev-plus-aosp