Merge "Remove Network, NetworkRequest metrics from jobscheduler" am: 77d6e7b0ba

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

Change-Id: I3770e6f3b146c47fa5b20dcd09e2bbd0fd69cbdf