[automerger skipped] PAST: Port implementation to GD am: 939f5b82 -s ours...

[automerger skipped] PAST: Port implementation to GD am: 939f5b82 -s ours am: c2e51152 -s ours am: baab8f63 -s ours

am skip reason: Merged-In Id7217b7b9d33549b488b6a0ef2dc9284dba24947 with SHA-1 f6c75720 is already in history

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



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