Merge "Fix FrameworksNetIntegrationTests failure" am: 4071a8ccb1

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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