[automerger skipped] Merge "Use newly defined NR Registration technology" am:...

[automerger skipped] Merge "Use newly defined NR Registration technology" am: 087cda62 am: 24d48736 am: 3ea60bde -s ours

am skip reason: Merged-In I347cbe56d7e2bc96e9d2e7928d8ac3368a0f00c6 with SHA-1 8a3b0533 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/1700131

Change-Id: Ibe296f872fccb88bc241035b86c72a17fb309d4a