Merge "Add TEST_MAPPING for Connectivity" am: 2ff7a8e1b3

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

Change-Id: I829c839620849e3a49be0f2629157f4adb9a1dcb