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

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



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