[automerger skipped] Merge "Remove Network, NetworkRequest metrics from...

[automerger skipped] Merge "Remove Network, NetworkRequest metrics from jobscheduler" am: 2a4adcb5 am: 23ae7da3 am: bd80ae17 -s ours

am skip reason: skip tag Change-Id Ie0c540303ba06b8fba029d2b98ae753afb08c963 with SHA-1 8aeeb338 is already in history

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

Change-Id: I5d2e532792b6abf0c35968f136c16a418ad2b380