Merge "Fix FrameworksNetIntegrationTests failure" am: 5d496eb9b3 am: d8d1d3e2b3 am: 8107226e38

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4a8b00c2f1b2d809e0aa3aa9f5a5cee58480fccd