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

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

Change-Id: I76450176fd6980bae9c9abfcc36f3e6bf6c798e7