Merge changes from topic "test-tethering-icmp" am: 19adc7adbc

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

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