Merge "Storing the user's VoNR setting" into sc-v2-dev am: 0b173dd918

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

Change-Id: Idf80321db9e33a3e3ae37678421510979ae5c18a