[automerger skipped] Merge "Move NetworkStackConstants to libs/net" am:...

[automerger skipped] Merge "Move NetworkStackConstants to libs/net" am: bfcd0ae1 am: 7383f3de am: 52421e67 am: ba2212e2 -s ours

am skip reason: Change-Id Ia69fed211ac9485beabc280cd17af2826b8ea7f9 with SHA-1 86d8f5bf is in history

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

Change-Id: Ia34a349e01b6f9f5002afd9004415ad8e263e590