[automerger skipped] Merge "Added nr advanced calling settings support" am: fd7f06247d am: 81eb3e7eba am: bc29477af9 -s ours am: 8d7715b91b -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: I5a693776c5be4a200f06155f84d913691bad1db5