[automerger skipped] Merge "VoLTE provisioned and WFC provisioned don't seem to work at INFO(4636) menu" am: 70e2ef8017 am: eb068a7bac -s ours am: 3e536c11a9 -s ours

am skip reason: Merged-In Ib0a1cbabe58e956f0ff0c83f484bded40b824a79 with SHA-1 1bf9d46f10 is already in history

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

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