Merge changes from topic "bug_268215362" am: 9d8a4627

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



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