Merge "Make getUid a method on UserHandle itself instead of static" am: bd1cc4f2a2 am: 6b7167e807

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

Change-Id: Icc006ab751a1a03aa3c09c1999a6141ff061081d