Add configurable em-dash separator for all concatenated keyguard strings

Fixes bug 7459426

Change-Id: I2e4944f25f3e4e62b734bc57db628f1b3ce263cd
4 files changed