[automerger skipped] Add test case to test normalize am: f444e9d182 -s ours am: 63077d4c7c -s ours

am skip reason: Merged-In I2f5790b9217357ddcf3f466cec1b2b1afbb47210 with SHA-1 5299a2b307 is already in history

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

Change-Id: I0513da65ff068c7d371832895893c64bf40c7e6f