tree 43bfa0a2b0f1a935ffe65d8bb415efc9572c4155
parent 48e612c30e4a608681177919ccf87aedc4872a2c
parent 58a9eef654dde6383f88691f2b19ac8b80de2bcf
author TreeHugger Robot <treehugger-gerrit@google.com> 1662035728 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1662035728 +0000

[automerger skipped] Merge changes from topic "presubmit-am-25573e946ece4fa1804202119abb6474-sc-dev" into sc-mainline-prod am: 58a9eef654 -s ours

am skip reason: Merged-In Ib1701358f9058aeaaa336be8d074cfaa700c4309 with SHA-1 9a2a8e5205 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/19784418

Change-Id: I312b7103e89847e1d8ff8085f57a07e65b04aed8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>