[automerger skipped] Merge "Allow CTS to include TestNetworkStackLib" into...
[automerger skipped] Merge "Allow CTS to include TestNetworkStackLib" into rvc-dev am: 92127893 -s ours am: bac09198 -s ours
am skip reason: Change-Id If52c689f414cc0730226306dae7d84a0283ef273 with SHA-1 252c6f2e is in history
Change-Id: Iaaad3648a08fbe57f74e0145dbfca37a6bd64f5a