[automerger skipped] Merge "Added nr advanced calling settings support" am: ec84453381 am: c366188272 am: 6b576ad443 -s ours
am skip reason: Merged-In Ie56a7de3fdb978353af77bafb55b0e37c22b58a4 with SHA-1 6a837e5352 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1885736
Change-Id: I5a95493c394f463f3194baeffb8d3280c6a70fb1
This commit is contained in: