[automerger skipped] android_get_control_socket uses crate::inherited_fd am: 9e4cacc907 -s ours am skip reason: Merged-In I247e357fd4b66f97daf070a525005fb00a32ede3 with SHA-1 0a95265207 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/librustutils/+/29485426 Change-Id: I4814dbf74d9b8c7b297ddda7552a7d0983b02864 Signed-off-by: Automerger Merge Worker <[email protected]>