[automerger skipped] Fixed NPE am: 8e328be2 am: 8d202508 -s ours am:...

[automerger skipped] Fixed NPE am: 8e328be2 am: 8d202508 -s ours am: 6730aed5 -s ours am: 2475fb98 -s ours

am skip reason: Merged-In I596c8174ab6f3ef595067b10b7e43598a79260dd with SHA-1 4adac653 is already in history

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



Change-Id: I0b8849b2f8770b097b2290d39ff93d0ca6cf5903
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>