Merge "Make getUid a method on UserHandle itself instead of static"