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

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

Change-Id: I89d940e0835f2f6db0449e88182dd23f40d92a05