Merge fixed history of Connectivity

BUG: 189375701
TEST: TH
Ignore-AOSP-First: per-branch merges

Merged-In: Ie3a058b904cb2e3704c3a0725c8f720f81bb235e
Merged-In: Ib95d84b91a455d1a5f10cbf3f8c08c0459bc1c7c
Merged-In: I37e52cf7d59b6dbcd77879725385c7940318b835
Change-Id: I12a430eda6d4b489cbd51369ab215e632833155c