[automerger skipped] Fix NPE in IMS Push refactor am: 461681f0 am:...

[automerger skipped] Fix NPE in IMS Push refactor am: 461681f0 am: 319f21d1 am: 7c32137f am: 3646d6af -s ours

am skip reason: Change-Id Idd819d7ce1b7a5ee33f53bd55adf9294aa0c6140 with SHA-1 a0be9a0b is in history

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

Change-Id: Ic69cfd78c521f6bee77e592af67681e889957951