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