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

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

Change-Id: Ib82573bf8c62acfd92bd2964be00a253c84075f7