Merge "Remove country name from space bar text when appropriate"

...rc/com/android/inputmethod/keyboard/KeyboardSwitcher.java

...rc/com/android/inputmethod/keyboard/MainKeyboardView.java

...putmethod/keyboard/internal/LanguageOnSpacebarHelper.java

java/src/com/android/inputmethod/latin/SubtypeSwitcher.java

...thod/keyboard/internal/LanguageOnSpacebarHelperTests.java

...method/keyboard/internal/NeedsToDisplayLanguageTests.java