Merge changes Id1d283a3,I3d228b93 into main am: 49aaa965 am: 7c07c6f8 am: e1d46a3e

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



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