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

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

Change-Id: I8db1c2339041330034015e8c872876090a421bef