Merge "Restore default contract returning string...

Merge "Restore default contract returning string bta_gatt_api::gatt_client_event_text" am: 91e76d3c am: 859d968b

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



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