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

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



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