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

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



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