Merge fixed history of Connectivity

Bug: 189375701
Bug: 186628461
TEST: TH
Ignore-AOSP-First: per-branch merges
Merged-In: I9f798dd3a96c917001d52e6167fceb59885ce6f0
Merged-In: I37e52cf7d59b6dbcd77879725385c7940318b835
Merged-In: Ie3a058b904cb2e3704c3a0725c8f720f81bb235e
Change-Id: I517c9af0f644ee59abebf56b6acce772c19b368d