Merge "Fix potential NPE when connecting" into sc-dev am: 7aa1bc6b7d am: 5f23e6ebbf
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14705676 Change-Id: I439700ea3eecb2e1c6ebd256bc86c996083cda3e
This commit is contained in: