[automerger skipped] Merge "Freeze Networkstack AIDL API as V6" into rvc-dev...
[automerger skipped] Merge "Freeze Networkstack AIDL API as V6" into rvc-dev am: 76e2b1e7 -s ours am: 34cc3b87 -s ours
am skip reason: Change-Id I01096d4fb9f60b675aae5c3fe5d5a49d9ae0775c with SHA-1 96398053 is in history
Change-Id: Iebbcef0e62b101ca12ca2d126d99937fd6183684