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

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

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



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