[automerger skipped] VoNR toggle am: e6abedb3 am: 5b3684a3 am: 1847811f...

[automerger skipped] VoNR toggle am: e6abedb3 am: 5b3684a3 am: 1847811f -s ours am: 104e0c32 -s ours

am skip reason: Merged-In I655dc93c0b213e1b85b29b9a168f99072ca82186 with SHA-1 5dbec20d is already in history

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

Change-Id: I45164080db1ec1b9aa16581b49a81b0dc2a2d7ef