Merge "Make getUid a method on UserHandle itself instead of static" am: 4bc8b1386f am: 84c2646d26

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

Change-Id: Icc006ab751a1a03aa3c09c1999a6141ff061081d