The string which contained the device
model information in settings was changed
to be more general. That way the model
information provided by the phone can be
more than just a number.
Test: Manual Inspection
Bug: 31108285
Change-Id: I7caf0a874983579b0e74240661b0d9b4df68bd74