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

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

Change-Id: I984eb31eaf7e88e2caeb61d2a239789fb8bc737d