Merge changes from topic "314331379-fix-tm-dev" into tm-dev am: d477f5ed am: 64af447d

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



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