Merge "Set CLOEXEC on socket inherited from init" am: 4cd0373251 am: f00fc84870

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

Change-Id: I2f9abfb8aa187bda2361113a954784d5e779b261
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>