Merge "Use UserHandle#getUid() taken a UserId" into sc-dev