Merge "Freeze netd AIDL interface (framework)" am: eb8d81ca14
am: e427c17917

Change-Id: Ib852b0555f0e20b858f9dd0b16dbd98dbbd22b55