Merge "Fix profile owners uid logic" into udc-dev am: d8700bfa am: c05ba85a

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



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