[automerger skipped] Merge stage-aosp-sc-ts-dev before making it an upstream...

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

am skip reason: Merged-In I14e544285d4096c404e33b79bc877836210523db with SHA-1 95c9d40c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/netd/+/15550182

Change-Id: I1de1f99f112166c0f2fe40f462ee518f0adf234e