[automerger skipped] Merge "Skip ab/6749736 in stage." into stage-aosp-master...

[automerger skipped] Merge "Skip ab/6749736 in stage." into stage-aosp-master am: e81fe41c -s ours am: a8228d22 -s ours am: 03f10235 -s ours

am skip reason: Change-Id Iebd8f8fdb3195d39829ebbe7f00bde09265431c7 with SHA-1 fab09fbc is in history

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

Change-Id: I47ed0a06c04d99a546b19076d6d3249ca0e88d1b