Merge "Fix an invalid memory access detected by ASan stack-use-after-return." am: 3aec1b54

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



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