Merge "VoNR toggle" into sc-qpr1-dev am: f36dd3cc76

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15645594

Change-Id: I3c4db256316ae816eb4ec3b71647135bdff4ccc7