Merge "Ensure connection is non-null" into rvc-dev am: 402bbb4a57 am: b68b87bc7f

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/11902845

Change-Id: I82c750fc3a78123f504c342d5a95d15211ef50ed