Merge "Fix popping up the the VoLTE screen when it's disabled by the carrier."...

Merge "Fix popping up the the VoLTE screen when it's disabled by the carrier." into main am: 9dc07f4e am: 4fec2b9e

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3481415



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