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

[automerger skipped] Merge "Added nr advanced calling settings support" am: ec844533 am: c3661882 am: 6b576ad4 -s ours am: 389152b8 -s ours

am skip reason: Merged-In Ie56a7de3fdb978353af77bafb55b0e37c22b58a4 with SHA-1 6a837e53 is already in history

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

Change-Id: Ia859a16d902595e2c8c864929e0c01fa6615cd75