[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO...

[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE am: 779478d3 -s ours am: 8fab8739 -s ours am: 4f632e18 -s ours am: 9b46f175 -s ours

am skip reason: Change-Id If225961307d07b5aba3c2cedfd929c159babb1e3 with SHA-1 f24d4c7a is in history

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

Change-Id: I621c64dbf495cfdd78d0bead5da9a737ff5c1265