[automerger skipped] Merge "Remove JobInfo usage of...

[automerger skipped] Merge "Remove JobInfo usage of NetworkRequest#networkCaps" am: fdef604e am: 0d18955d am: c83a61de -s ours

am skip reason: Change-Id I47e7ab1b887b2fe2dddef223bd7c66bdd290fc56 with SHA-1 d2ef0904 is in history

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

Change-Id: I922240353d16d3f7fee0e4bc69278916a77b0430