Merge "Remove UidRange.createForUser() with userId integers" am: 9c92c37f56 am: 5809c1f054

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I53fdc5ad0cb8f6859c025a11b08ea7f77fb45442