[automerger skipped] Merge "BugFix - IMS features registration state null...

[automerger skipped] Merge "BugFix - IMS features registration state null check" am: e4eeabd0 am: c32c8edd am: 283115e0 -s ours

am skip reason: Merged-In I3ce1beab2cdbf3373595f46a26f152d1565d33a0 with SHA-1 0d035dd8 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2019197

Change-Id: Ia9c54f0556e0b2dfb383744a5f35a2f14462f841