[automerger skipped] Merge "Allow CTS to include TestNetworkStackLib" into...

[automerger skipped] Merge "Allow CTS to include TestNetworkStackLib" into rvc-dev am: 92127893 am: 4ebd0d5c am: 622196a7 -s ours

am skip reason: Change-Id If52c689f414cc0730226306dae7d84a0283ef273 with SHA-1 252c6f2e is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/11629114

Change-Id: I745d7e50da768fdab3864c51bdff7fcf289c3051