Merge changes Ie000244a,I3a55bc74

* changes:
  Add test for NetworkTemplate.Builder#setRoaming(int)
  Add NetworkTemplateTest to common test for cts coverage