Merge "Remove TEST_MAPPING duplicate imports" am: 8691f3c286 am: 6bd4188a47

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

Change-Id: I7490b404da51fcbc34c5549390bc09a845f16d56