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

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

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



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