[automerger skipped] Merge "Ignore null binding on service died" am:...

[automerger skipped] Merge "Ignore null binding on service died" am: 889980a0 am: 84489156 am: 1dfcdf39 am: 926fb849 -s ours

am skip reason: Change-Id I1b3ae578ad318d176e8fad86c4b768aebe9c893f with SHA-1 4f728c8c is in history

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

Change-Id: I90d80ec8076fdb7c32b14b9f3fd8a64c6dd8cfae