Merge "PackageManagerService: Check for duplicate inactive factory packages" am: 2df3d4e066 am: 9370336358 am: 3dd1c5cff5

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1894442

Change-Id: I4d639b93ded6d761c31dbe7c0efd8795a9bb4fe1