Merge "Fix incorrect merge resolution for aosp/2380852" am: e86cf63d am:...

Merge "Fix incorrect merge resolution for aosp/2380852" am: e86cf63d am: ec455e98 am: baaccac8

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



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