[automerger skipped] Merge "VoNR toggle" am: 767bb4afb0 am: 8252b1e67e am: 638c31d8dc -s ours am: edbc0b4e9b -s ours

am skip reason: Merged-In Ice041b6bcffba25deac3ba91ae1edfcde447e762 with SHA-1 daf060f5a3 is already in history

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

Change-Id: I767191d79908b346cff7bdf9c88261a5e70c1ae9