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

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

Change-Id: I5aa2cd09e100518d131a8df60beae0c7a581ba80