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

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

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