[conflict] Merge changes I9fb87084,Ife34e144 into main am: 2324dace

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



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