[automerger skipped] Merge "Revert^2 "Add shims for NetworkRequest"" am:...

[automerger skipped] Merge "Revert^2 "Add shims for NetworkRequest"" am: 5096e1c9 -s ours am: b62df6ca -s ours am: 53658809 -s ours am: e7df2665 -s ours

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

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

Change-Id: I7be7e55282da451ae6f20887eef6b7626339d496