Add an option/category in Dev Set to customize the device hostname [2/2]

Change-Id: Iee14e90fa6fb6a13a123d92b7cf6dceaf6d99ffc
Merge "Add an option/category in Dev Set to customize the device hostname [2/2]" into lollipop