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

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

Change-Id: I075f3e353ac2feebd6fd18ca264cb2b0e7d3cf8f