Merge "Build framework-connectivity using module_current" am: 40d3b1fbea am: 6e64634da0

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

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