Merge "Chanage uid to userId where it denotes an Android user id." am:...

Merge "Chanage uid to userId where it denotes an Android user id." am: 978faa37 am: 230d6658 am: 57f6b769 am: 93e92897

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1436554

Change-Id: I1fec9548bad2d4384a1daf7893ca40ed55160480