Merge "Fix test failures in the following test cases" into main am: 18ca5ac7

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



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