Merge "Move connectivity AIDLs to android.net" into sc-dev