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

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

Change-Id: I6c4abbd347840ddc3839303689ac06e55899ac50