Merge "Deprecate INetd for devices after version 7" am: e8086cc84d am: ae4f2e8962

Original change: https://android-review.googlesource.com/c/platform/system/libhidl/+/2095345

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