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