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

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

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