[automerger skipped] Merge ab/7633965 am: f237df3092 -s ours

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

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

Change-Id: I875e8d2b3d42d8cf4bc6ccfc25adf483faf09663