Merge "Revert "VoLTE provisioned and WFC provisioned don't seem to work at INFO(4636) menu"" into tm-qpr-dev am: f18e34c52d am: 521082bd26

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

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