Merge "get rid of needless use of NONEXISTENT_COOKIE which is simply 0" am: 74742cca73 am: 5c45c2fb5c am: 4a0c0e99ed

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

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