Merge "Mark com.android.server.textservices.LocaleUtilsTest as @SmallTest"