Merge changes Ie441f6a1,Iff255a92 into main am: 8b8cad09 am: fad1712e am: d9cebb35

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



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