[automerger skipped] Merge "Revert^2 "Add shims for NetworkRequest"" am: 5096e1c9 -s ours
am skip reason: skip tag Change-Id I0b79c73e82b6d0040cb3e5a822c40f62c329ce3f with SHA-1 c499afce is already in history Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/1646846 Change-Id: Ie55259a9ba504ce9252e989a28d497cb3155766f
Loading