Merge "PackageManagerService: Check for duplicate inactive factory packages"