[automerger skipped] Fix ConnectionServiceFocusManager NPE am: 021a0ee8 am:...

[automerger skipped] Fix ConnectionServiceFocusManager NPE am: 021a0ee8 am: 16e65883 am: df26b7f8 am: 75a005b1 am: c136a962 -s ours

am skip reason: Merged-In I62c6e6b75ab691ca8057f8151acacf6623fe53f9 with SHA-1 c5ec887f is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telecomm/+/2747814



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