[automerger skipped] Merge "Add null check for received intent." into...

[automerger skipped] Merge "Add null check for received intent." into sc-qpr1-dev am: aadf244e am: 08d2d289 am: e03999e7 -s ours

am skip reason: Merged-In Ic4f0f525c8e9f703eded2a0fd32fbfee1b2359c9 with SHA-1 5a1efffd is already in history

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

Change-Id: Ibd372d0a3de5e6a3aa422e6b41399752fbca44e3