Merge "[DON'T BLOCK] Test ownership migration rules" into main am: bde6760fd1

Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2950606

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