Merge "Fix FrameworksNetIntegrationTests failure" am: 4071a8ccb1 am: 438f45fc13

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib4172f2b4eaec4f154bc8092531638cea3526d5f
tree: 9a6cb59820980ac7b67eeca1d3c6b55aeaca41a8
  1. core/
  2. service/
  3. services/
  4. tests/
  5. OWNERS