Merge "Add test for NetworkTemplate.Builder#setRoaming(int)" am: c7975ff3bf

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2020578

Change-Id: I89eca100f8547a595a38f787ee086b673cbf6821
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>