[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 am: 3bbc506c am: 4aad086a am: fc8d72da -s ours
am skip reason: Change-Id I01096d4fb9f60b675aae5c3fe5d5a49d9ae0775c with SHA-1 96398053 is in history
Change-Id: I35854b02409227623f5d22e0ad5053bc1d47f282