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

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

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



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