Merge "Simplify UserHandle.equals"