[automerger skipped] Merge "VoNR toggle" am: 02a97477 am: 03b9ef36 am:...

[automerger skipped] Merge "VoNR toggle" am: 02a97477 am: 03b9ef36 am: 396f1530 -s ours am: 64136f74 -s ours am: 956af59d -s ours

am skip reason: Merged-In I55ca15a35310c444e91807554b9dcc7355040d86 with SHA-1 b3a73d7e is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1881148

Change-Id: I7e388936f8dd0fbfdfc7049f6a16921fd157f7a0