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: 41aef949 am: 6f932acc

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



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