Merge "Bump version codes in tm-dev to match tm-mainline-prod am: b84c590e02 am: 39ca736765" into tm-d1-dev-plus-aosp am: 0f39b1d5c3

Original change: https://googleplex-android-review.googlesource.com/c/platform/art/+/18603944

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