Tweak user agent building to avoid multiple spaces

 Bug: 3211038
 The building of the user agent could previously have multiple sequential
 spaces. This was causing the CTS test to fail.

Change-Id: I13fc76ba6b97ee84dd44461b4d03b6ca70b48cdf
1 file changed