[automerger skipped] Added nr advanced calling settings support am: a59b54c545 am: f80718c39f -s ours

am skip reason: Merged-In Ifaaf4174c7dc0bdb72fabc9117207edc206c07fb with SHA-1 331e0f4f04 is already in history

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

Change-Id: If735ef253c9973ebe32f7fddd823411391a5489f