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

Change-Id: Ifb3e8e492049da56e2ac09ff1780875db11ea8fe