Skip merge of: Merge fixed history of Connectivity

This merges commit b2f2271ef16b11403ac64281b3bca51705f0ec82 with
"-s ours"

Bug: 186628461
Test: TH
Ignore-AOSP-First: per-branch merges
Merged-In: I9f798dd3a96c917001d52e6167fceb59885ce6f0
Merged-In: I37e52cf7d59b6dbcd77879725385c7940318b835
Merged-In: Ie3a058b904cb2e3704c3a0725c8f720f81bb235e
Change-Id: I36d8f58d5cc16d32d3927976394a732945de4767