Merge changes from topic "Bug282931760" am: 78133222

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



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