Merge "Clockwork: add feature android.software.input_methods" into oc-dev
am: eed865e61b

Change-Id: I8698f6f42fcbe2239493c6e03d8f850687c1de8c