Merge "Added nr advanced calling settings support" into sc-v2-dev am: 8fd3a38f5a

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

Change-Id: I4fbed84604bda26fab5f8aa5f679dd7339ebbefc