[automerger skipped] Merge "Bump Mainline Module Version Codes in AOSP to...

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

am skip reason: Merged-In I0db5b6f3de81b7009381b3ac28bf03f5819acf14 with SHA-1 0c5ef11d is already in history

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



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