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

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

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

Change-Id: I9bc3f32e2efcf4dbe7e113ba4e8e95beeacf97fb