[automerger skipped] Skip merge of: Merge fixed history of Connectivity am: 689b08d86d -s ours am: 1f0e609863 -s ours
am skip reason: Merged-In Ie3a058b904cb2e3704c3a0725c8f720f81bb235e with SHA-1 f9e7c2a543 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14809399
Change-Id: I0ba58fbb752b1840f952385127d31b0c8faab030
This commit is contained in: