[automerger skipped] Merge "Add shims for NetworkRequest" into...

[automerger skipped] Merge "Add shims for NetworkRequest" into rvc-qpr-dev-plus-aosp am: 5a73607a -s ours am: 774a314a -s ours

am skip reason: skip tag Change-Id I0b79c73e82b6d0040cb3e5a822c40f62c329ce3f with SHA-1 6b52ee4c is already in history

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

Change-Id: I0ecc960c9d0a7e3d2491c75868e170542308f3f3