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

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

Change-Id: I7bd9dc4901ea7c3991a64a771e1bf67494cea67e