[automerger skipped] Merge "Bump Mainline Module Version Codes in AOSP to 339990000" am: 7884a2f2b8 -s ours

am skip reason: Merged-In Ib225fcff4e6635c5d10280c1e7ae66bb56ca8c3f with SHA-1 64b20c6655 is already in history

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

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