[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 am: 5045c775 -s ours am: b36d3d58 -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: I54031fb44edc300ba8829b9fdd83578bc1a36e13