[automerger skipped] Merge "Remove Network, NetworkRequest metrics from jobscheduler" am: 40a440f0dc am: 26ebda35aa am: ad8412de63 -s ours

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

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

Change-Id: I5d2e532792b6abf0c35968f136c16a418ad2b380
tree: ea070e8bc0d301951cc69d11773e39c226fa0dca
  1. framework/
  2. service/
  3. test/
  4. OWNERS
  5. TEST_MAPPING