[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 -s ours am: 6031fd4a -s ours am: 3f489a34 -s ours am: b646c2bf -s ours

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

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



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