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

[automerger skipped] Merge "Added nr advanced calling settings support" into sc-v2-dev am: 8fd3a38f am: 50a41d25 -s ours

am skip reason: Merged-In Ie56a7de3fdb978353af77bafb55b0e37c22b58a4 with SHA-1 204ec2ae is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16036709

Change-Id: Idfee99fbf5f9f2f4a91a462870d05e33bc97a3d6