Merge "PackageManagerService: Fix ABI adjustment logging"