[automerger skipped] Merge "Added nr advanced calling settings support" am:...

[automerger skipped] Merge "Added nr advanced calling settings support" am: 6d86bbbb am: 5d99d2fb am: ac59bd51 -s ours am: 721868ee -s ours

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

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

Change-Id: I9957082f843e3c59e4bf43864fdb402aa8bba3c9