[automerger skipped] Merge "btif_hf: Fix NULL phone number" into tm-dev am:...

[automerger skipped] Merge "btif_hf: Fix NULL phone number" into tm-dev am: 3dc07108 am: 7b806f5f am: c6d83538 -s ours

am skip reason: Merged-In I2be64c3db39e35ff4b31de4714634e77670338c3 with SHA-1 dd4388a9 is already in history

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



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