Merge "Use UserHandle instead of int for public APIs"