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: Ib6be3e0d4f369acc8540051ff4117310057c8d46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>