Merge "tbs: Use contact name instead of caller name as friendly name" am: 72b0bc27

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



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