[automerger skipped] [pm] a system config to let oems register uids am:...

[automerger skipped] [pm] a system config to let oems register uids am: 0f699cbb -s ours am: 7967cd1c -s ours

am skip reason: Merged-In Ic436003390c8feb4c5e9a36106abc1f7ab7f5a46 with SHA-1 077343ad is already in history

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



Change-Id: I01af38b62925411c7e2f2e17be571df39bc0de17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>