Merge "Update TEST_MAPPING imports for connectivity" am: e063867f7b

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

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