[automerger skipped] Merge "Build framework-connectivity using module_current" am: ea96653e66 am: 719ae7062d am: 1778eda40a -s ours

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

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

Change-Id: I4cf3780210515b5849832055c88dd189d7d61177