Skip merge of "Merge fixed history of Connectivity"

This merges commit 689b08d86d4c4991dd1cca794b291581bb3b4b51 with "-s
ours".

Bug: 186628461
Test: TH
Ignore-AOSP-First: per-branch merges
Merged-In: I3e3de8eaa14a44cfea00bc2e56fd1cbe2bb657dc
Change-Id: I60f8b7e5011b6cc07212f45df5a6a1d83405488d