[automerger skipped] Merge RQ3A.210705.001 to stage-aosp-master - DO NOT MERGE am: f9405156ad -s ours

am skip reason: Merged-In Iabe4c2b81dbf67ed767210f0f389638dc7ad55e8 with SHA-1 c7b75c82a0 is already in history

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

Change-Id: I635dd712409a3fc0065f2a2bd9da02e412e268fd