am f6915fbb: Add more choices to about:debug UAString setting

Merge commit 'f6915fbb568e513a1968f6a4311559b5c832064d' into gingerbread-plus-aosp

* commit 'f6915fbb568e513a1968f6a4311559b5c832064d':
  Add more choices to about:debug UAString setting