Merge "Address comments on NetworkStack AIDL v6" into rvc-dev