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

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

Change-Id: Ia07e43d47cf2130777a9391c41f95862fd56a53d