[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: 65171cdf -s ours am: 27ee2365 -s ours

am skip reason: Merged-In Ic4f0f525c8e9f703eded2a0fd32fbfee1b2359c9 with SHA-1 3d6b9ac2 is already in history

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

Change-Id: Iaac165054fac7a80eb701ec4ffa597b1458154f1