Merge "Update TEST_MAPPING imports for connectivity" am: e063867f7b am: da2dfee6d5

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

Change-Id: I0d5d0be2d59eca6447419a92039be82a0769a5b4
tree: b4bb5c5d68e24e3dcc0f07c80ebea8eef50946b9
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS
  7. TEST_MAPPING