Merge "Move strings used for physical keyboard layout into SettingsLib" into tm-dev