Merge changes Ifa029c35,I370a549a into main am: 403deac0 am: b3b1fcab am: 9d700cf9

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



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