[automerger skipped] Merge "Build framework-connectivity using module_current" am: eb0961067e am: d1104c9620 am: b51eefe6de -s ours

am skip reason: Merged-In I2d51d37d067bf6fe86e4dedf05855a2dd67ed57c with SHA-1 3b52af9c6e is already in history

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

Change-Id: I4cf3780210515b5849832055c88dd189d7d61177