Merge "Support optional parameters for CSLocalAgentCreationTests" into main am: a5bd71c4fe

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

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