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

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

Change-Id: If874384daa1702d9582021d894dbd5ae40231c88