Merge "Fix mangled javadoc for setPermittedInputMethods." into lmp-mr1-dev