Merge changes from topic "netd_aidl_conversion" am: 8e4348e3f0 am: 7be3d7ee00 am: 694b7c320b

Original change: https://android-review.googlesource.com/c/platform/system/hardware/interfaces/+/2096034

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