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