Merge "Move connectivity AIDLs to android.net"