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

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



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