Protect against NPE while to updating service connection activities.

Bug: 28972558
Change-Id: I83f6e33248bb5b5c6ed34a3590d594bf82463a96
2 files changed