am bc71d036: (-s ours) am 3e46ead6: (-s ours) am c2711274: Add tests for InputMethodSubtype. DO NOT MERGE * commit 'bc71d036': Add tests for InputMethodSubtype. DO NOT MERGE