Merge "get rid of needless use of NONEXISTENT_COOKIE which is simply 0" am: 74742cca73 am: 4814a0486b

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

Change-Id: Ibf97fc5caf022dc1d56cbd2a3c6c2e574f882d01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>