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

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

Change-Id: I80602fec24c4d5701ff6a4ed16cf3d61609d3e73