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

Merge "Fix profile owners uid logic" into udc-dev am: d8700bfa am: 33894eaf am: e4d70a76 am: 8609777c

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



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