Merge "Update TEST_MAPPING imports for connectivity" am: e063867f7b am: 8b159b455f

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1680905

Change-Id: I0d5d0be2d59eca6447419a92039be82a0769a5b4