Merge "Store connections by token instead of by fd" into sc-dev am: 2a4e4e58

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

Change-Id: I695044874068b54265f5a754fbfb3564d5c3da49