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

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

Change-Id: Ie3d8de6a1df69231367c8d476a158070d21f7f91