[automerger skipped] Merge "Support e-calling by default on HFP Client" into...

[automerger skipped] Merge "Support e-calling by default on HFP Client" into tm-qpr-dev am: 37f80e6b -s ours am: 310fc263 -s ours

am skip reason: Merged-In If17a59317863cd63d27f8daf16a7cf2fe74df29c with SHA-1 f63ddbd1 is already in history

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



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