Merge "Build framework-connectivity using module_current" am: eb0961067e am: d1104c9620

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

Change-Id: I47046e76bab062d0f887f2f965c054054acba0c5