[automerger skipped] DO NOT MERGE - Skip ab/7272582 am: e33ddc7351 -s ours

am skip reason: Merged-In I1860c4df61e12087345ae723b4b3201d7575664a with SHA-1 fab704eb32 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/1736099

Change-Id: I4a1584f025ccbe21fa4c3d46c7503653de791a7d