[automerger skipped] Merge changes Ibfaa0438,I3655237b into tm-d1-dev am:...

[automerger skipped] Merge changes Ibfaa0438,I3655237b into tm-d1-dev am: fb6b13ac am: 88339aba -s ours am: 26254d6f -s ours

am skip reason: Merged-In Ibfaa04383310c6e79118467c9b262f8f29fc913c with SHA-1 85ef15ce is already in history

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



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