[automerger skipped] Fixed NPE when subscription plan is null am: d187f6fd...

[automerger skipped] Fixed NPE when subscription plan is null am: d187f6fd am: f0cd168c am: 1a6ec0cd -s ours

am skip reason: Merged-In Ibe4eef38e8ce1252a9f4905482b0e378a02fde93 with SHA-1 46166bd5 is already in history

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

Change-Id: I1d8ce6c220bcf488b30a471d6ccce6147c2f338f