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

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

Change-Id: I5ce25048e062947f1192b820b5c50b1bc744a7ac