[automerger skipped] Merge "Merge...

[automerger skipped] Merge "Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918" into stage-aosp-master am: cbe947e3 -s ours am: df407454 -s ours

am skip reason: Merged-In Ib740d6447422c233f8d1c8df7abf6a922ba6d633 with SHA-1 b9462cab is already in history

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

Change-Id: I8042f5446a3f6960214192018d309dec82d70958