[automerger skipped] Merge "Added nr advanced calling settings support" am: fd7f06247d am: 81eb3e7eba am: bc29477af9 -s ours

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

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

Change-Id: I01b5a907f586c9dbee940a4fede3630db00c26b4