[conflict] Merge changes I639960af,I7167f6fd am: 9e7b36cb

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



Bug: 239956470
Test: m
Change-Id: I95f3ea34aee14c40dc38ed520adad308ade25d9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>