[automerger skipped] Merge "Add the REGISTRATION_TECH_NR Tech type" am: 0ad0a881 am: e8d7017b am: 5272296d -s ours am: 16ccba2d -s ours

am skip reason: Merged-In I4b0f9882dcf36e2ff7151778cbadb8e83513df5a with SHA-1 5934699a is already in history

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

Change-Id: Ic061d3b2e3dc779c8092d90cfa04650ea98eabf6