[automerger skipped] Merge changes from topic "314331379-fix-tm-dev" into...

[automerger skipped] Merge changes from topic "314331379-fix-tm-dev" into tm-dev am: d477f5ed am: 64af447d am: a19abc1f am: 238ae064 am: 39cfe342 -s ours

am skip reason: Merged-In I0f3c1b46e103e4bf7d9cd3240168faaaa271cebc with SHA-1 27a98dc0 is already in history

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



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