Merge "Set additional subtypes before getting current subtype"

.../android/inputmethod/latin/AdditionalSubtypeSettings.java

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

...com/android/inputmethod/latin/RichInputMethodManager.java

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

...c/com/android/inputmethod/keyboard/SpacebarTextTests.java

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