Merge "Remove TEST_MAPPING duplicate imports" am: 8691f3c286

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

Change-Id: Ibdf2232353b36440dc1c4e7cb6c1085c26ea959b