Skip merge of: Merge fixed history of Connectivity

This merges commit 1af06c78dfed9d8ed260f042b197f9cfbca5b50c with
"-s ours"

Bug: 186628461
Test: TH
Merged-In: Ib95d84b91a455d1a5f10cbf3f8c08c0459bc1c7c
Change-Id: I5fd3b9c2686f9261166ef8e16ce8d55e1eff2cd7