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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/18603945



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