[automerger skipped] Merge "Change RadioServiceProxy from null to empty when...

[automerger skipped] Merge "Change RadioServiceProxy from null to empty when service not available" am: a1b4bd7a am: e7dc5eab am: 7e4be24b -s ours

am skip reason: Merged-In Ia6e7d4db785ff330e7502103586a1b91b2e675ed with SHA-1 02b3a8a6 is already in history

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

Change-Id: I83a20ff0c2819f7336b32eadd852bbb12c3c1337