Merge "Clarify how IME ID is treated in ImeSubtypeListItem#compareTo()"