Merge "Bump Mainline Module Version Codes in AOSP to 339990000" am: 7884a2f2b8

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

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