Merge "Add testIpv4AddressForSapAndLohsConcurrency test case" am: f4ef96c62f am: bf971ae11c am: 0a8919cda4

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

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