[automerger skipped] Revert "[resolved conflict]  Add test case to test normalize am: f444e9d182" am: 48683e2439 -s ours

am skip reason: Merged-In I2f5790b9217357ddcf3f466cec1b2b1afbb47210 with SHA-1 f444e9d182 is already in history. Merged-In was found from reverted change.

Reverted change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/16251687

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

Change-Id: I14c167625d8f098388d0c3012385989af0ef2b4c