Merge "Add testConnectedClientsForSapAndLohsConcurrency test case" am: c23fb4f1ea

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

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