Merge "Added nr advanced calling settings support" am: fd7f06247d am: 81eb3e7eba

Original change: https://android-review.googlesource.com/c/platform/packages/providers/TelephonyProvider/+/1885735

Change-Id: Id3c1c3f2f0567b72669e2248de76f6dbe47fd866