Merge "Force specifying sanitized/not sanitized in caps from agent" am: 1896d713cc

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

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