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

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

Change-Id: I1acd627f5316b88739c1d10fb5c788751d62938e