Merge "Bump version codes in tm-dev to match tm-mainline-prod" into tm-dev am: edda01a744

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

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