[automerger skipped] Added nr advanced calling settings support am: 8e68fd6d...

[automerger skipped] Added nr advanced calling settings support am: 8e68fd6d am: 72510add -s ours

am skip reason: Merged-In I5dacb4aee498fcda32debd0234937f691ad73981 with SHA-1 ea06f5ea is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/16039490

Change-Id: I52c14f758ead4b7cccee680845d12203bc456ce0