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

[automerger skipped] Merge changes Ibfaa0438,I3655237b into tm-d1-dev am: fb6b13ac -s ours am: 90560d12 -s ours am: 4aa47ebb -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: I613caf4e8416fea4574e3ea5188577cfa7cf02d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>