Merge "Merge "Protect against NPE while to updating service connection activities." into nyc-dev am: cef12198a7 am: e3190c206c" into nyc-mr1-dev-plus-aosp
am: 5fd350997d
* commit '5fd350997d3a575c1064a62df2735ed523fa20bd':
Change-Id: I2921851366489234c7d2b41b437922d42df5afce
This commit is contained in: