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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4a8b00c2f1b2d809e0aa3aa9f5a5cee58480fccd
tree: 843bc032996445996603fec487cb56274e5b58fb
  1. core/
  2. service/
  3. services/
  4. tests/
  5. OWNERS