[automerger skipped] Merge "PackageManagerService: Check for duplicate...

[automerger skipped] Merge "PackageManagerService: Check for duplicate inactive factory packages" am: 2df3d4e0 am: 93703363 am: 3dd1c5cf am: 33524eb0 -s ours

am skip reason: Merged-In I5b5469fc6879bbeee4dc2ea47b2046ab011a65ce with SHA-1 56172ee8 is already in history

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

Change-Id: I2801d946c4ea9ed7959434376f6a1a6f6373aea4