Merge "Add test case to test normalize" am: b5ee639fe0 am: 663dfcaec0 am: 176e8b7f6b

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

Change-Id: I868cd96b4cd0076880a026afa121d002d9b78625