Merge "Remove JobInfo usage of NetworkRequest#networkCaps" am: fdef604e07 am: 0d18955d47

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1512666

Change-Id: Ib154e508d4d6e3be54df4d598ccb1686e602b023