[automerger skipped] Merge "Fix a few NPEs due to trying to access a null...

[automerger skipped] Merge "Fix a few NPEs due to trying to access a null collection's iterator" am: e760d37b am: 5b2128d0 -s ours am: 3b5ee7ce -s ours am: fa6b2809 -s ours

am skip reason: Change-Id Iae81d704a637c66eb706a5f881c26086d7ba3300 with SHA-1 0c37598e is in history

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

Change-Id: Iab7411a6538e1486a342866c704659908a3672f4