Merge "Merge "[VoNR] VoNR settings" into sc-qpr1-dev am: 9354a7e81c
am: fe74266ba4" into sc-v2-dev-plus-aosp am: 0a42e77619
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15737579 Change-Id: I662b89f689aeffe66ffa7e5dde089944c0c4fe7d
This commit is contained in: