[automerger skipped] Merge "Block voice call based on carrier config." into udc-qpr-dev am: 8c48d271c1 am: d70c032359 -s ours

am skip reason: Merged-In Ie36bfa7ab4f25871ebf3de8697b259b8e21ed298 with SHA-1 a4bd971510 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telephony/+/24060887

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