Merge "CookieTagMapValue.java - uid U32 -> S32" am: b202c7a96b

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

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