Merge changes Id1d283a3,I3d228b93 into main am: 49aaa965 am: ec9d1d10 am: dec39d85

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



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