[automerger skipped] Merge changes I3f609fe5,Ide5b514b,Ibe0a9880 into tm-dev...

[automerger skipped] Merge changes I3f609fe5,Ide5b514b,Ibe0a9880 into tm-dev am: 06de850d am: 4c11bf1e -s ours

am skip reason: Merged-In I3f609fe5f248e214ec7fb2ae75f6dc1e886d3059 with SHA-1 5d6d21a6 is already in history

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



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