[automerger skipped] Merge "Allow CTS to include TestNetworkStackLib" into...
[automerger skipped] Merge "Allow CTS to include TestNetworkStackLib" into rvc-dev am: 92127893 am: 4ebd0d5c -s ours
am skip reason: Change-Id If52c689f414cc0730226306dae7d84a0283ef273 with SHA-1 2c18f6b2 is in history
Change-Id: If2c54a6d4bf6a95de9485192b7fcbe2ac19b082f