[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 -s ours am: f6f31819 -s ours am: 16e99431 -s ours am: 64e876b0 -s ours

am skip reason: Merged-In I27be1f93598820a0f2a7154ba83f5b041878c21f with SHA-1 d6e9fdf1 is already in history

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



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