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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib4172f2b4eaec4f154bc8092531638cea3526d5f