Merge fixed history of Connectivity

Bug: 189375701
Bug: 186628461
TEST: TH
Ignore-AOSP-First: per-branch merges
Merged-In: Ib95d84b91a455d1a5f10cbf3f8c08c0459bc1c7c
Change-Id: Id42a562cfaccc4bf0bae8a40635777841ed6d232