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: If4b744482aa4835436a3e09c6b5c974c51cd1e5e