(DO NOT MERGE) Refactor InputMethodAndSubtypeEnabler a bit

Change-Id: Id91b62ed084f98e3a6dc724aac9d926d89a96201
(cherry picked from commit a5db65fe11f862747c34f271ea416052c653300d)
1 file changed