[automerger skipped] Merge "Fix phone number is not displayed on the car kit."...

[automerger skipped] Merge "Fix phone number is not displayed on the car kit." am: 2c4533dc am: abe00ca0 -s ours

am skip reason: skipped by user plhuang

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

Change-Id: I4407ffa2824673607fd92bdf6e85b2d2d3c5a709