Merge "Force specifying sanitized/not sanitized in caps from agent" am: 1896d713cc am: 69213fd19c am: 8cc3bf7a8e

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

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