[automerger skipped] Merge "Build framework-connectivity using module_current" am: 40d3b1fbea am: 6e64634da0 am: 32df5aa7bb -s ours

am skip reason: Merged-In I2d51d37d067bf6fe86e4dedf05855a2dd67ed57c with SHA-1 2a311db05b is already in history

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

Change-Id: I4cf3780210515b5849832055c88dd189d7d61177
tree: e6b0c9cb56e733edbc1ee0b85761e9cbcdf466cd
  1. framework/
  2. service/
  3. services/
  4. test/
  5. tests/
  6. OWNERS
  7. TEST_MAPPING