[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: 19e90f4f -s ours am: 50b5241d -s ours

am skip reason: subject contains skip directive

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

Change-Id: I513a486a273c813ac634a96997aaa35ba25ebe4e