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

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



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