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

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

Change-Id: Ib19a96d6ccbd32d7bd33c2465ee1f195e3118bb4