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

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

Change-Id: If5ba07aa4d6b3a580b255c1c3ce228bffd0a7697