Merge "Added nr advanced calling settings support" am: ec84453381 am: c366188272

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

Change-Id: I981d300ed36a522f6ba39bad485cabe7f71926a8