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

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

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