This reverts commit a63d0a8ee6.
This patch seems to be fine after all, but was submitted without its companion [ML1.1] patch causing a build breakage. Reverting the revert and submitting both at the same time seems like the right thing to do.
Change-Id: Ib8fefa40b74dcee0edb025a52dac9b35c82d49df
Remove country name from space bar text when there no other subtype
that is a same language and a same keyboard layout.
Bug: 8084704
Change-Id: I7c785a925ff7a0a61e5d009f138e1df52b3aeb3a
