Merge "Reintroduce InputMethodInfo constructor for CTS" into main