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: 0a9a86f6

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



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