Merge "Use local copy of vm_sockets.h on non-Trusty for portability" into main...

Merge "Use local copy of vm_sockets.h on non-Trusty for portability" into main am: da53c5ea am: 12e7a21e

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



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