Merge changes from topic "am-1026407531bf4c0fbb3e018988f04974-sc-dev" into sc-dev am: 99f5d10a02

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

Change-Id: I5c08c0c0918591f1a617bf89723d0483a1bcdd55