tree 2a81890d87ca692cd5d28406ea2bd458f8618210
parent 1a1ab4a4abf9dddbe6b5dc19b6fa982b76b982bf
parent b5c6036c291feac62c611f0052edb9897f0cde61
author Xin Li <delphij@google.com> 1628888011 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1628888011 +0000

[automerger skipped] Merge stage-aosp-sc-ts-dev before making it an upstream am: b5c6036c29 -s ours

am skip reason: Merged-In I592dd5f1d6e13b020beadb11b9d913857a82e524 with SHA-1 58b493abf6 is already in history

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

Change-Id: I6c8ea5e480616212dee710e111cd4b16d6533b7d