[automerger skipped] Merge "[DON'T BLOCK] Test ownership migration rules" into main am: e7aa45cdf0 -s ours

am skip reason: Merged-In I243f17b3f0ad7af9ffa15ca242456e36688733f5 with SHA-1 985604c94f is already in history

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

Change-Id: I57b2c171abde1fb841c5a11833312338255bcbe9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>